add missing macros and declarations

Use genlib.h instead of stdlib.h and math.h in umon_main/target.

diff --git a/umon_main/target/common/dosfs.c b/umon_main/target/common/dosfs.c
index dfe22bc..37f3384 100644 (file)
--- a/umon_main/target/common/dosfs.c
+++ b/umon_main/target/common/dosfs.c
@@ -27,7 +27,7 @@
 
 #if INCLUDE_FATFS
 #include <string.h>
-#include <stdlib.h>
+#include "genlib.h>
 
 #include "dosfs.h"
 

diff --git a/umon_main/target/common/ecc.c b/umon_main/target/common/ecc.c
index 999fef7..0f68f80 100644 (file)
--- a/umon_main/target/common/ecc.c
+++ b/umon_main/target/common/ecc.c
@@ -39,10 +39,10 @@
  */
 #ifdef STANDALONE
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#include "genlib.h"
 #endif
 
 typedef unsigned char uchar;

diff --git a/umon_main/target/common/genlib.h b/umon_main/target/common/genlib.h
index 344de99..7ac2c08 100644 (file)
--- a/umon_main/target/common/genlib.h
+++ b/umon_main/target/common/genlib.h
@@ -26,11 +26,25 @@
 /* Some compilers consider sizeof() to be unsigned... */
 #define sizeof (int)sizeof
 
+#define HUGE_VAL (__builtin_huge_val())
+#define NULL ((void *)0)
+
+typedef struct {
+       int quot;
+       int rem;
+} div_t;
+
+typedef struct {
+       long int quot;
+       long int rem;
+} ldiv_t;
+
 extern int optind;
 extern char *optarg;
 
 extern int abs(int);
 extern int atoi(char *);
+extern double atof(const char *);
 extern int memcmp(char *, char *, int);
 extern int strcmp(char *, char *);
 extern int strcasecmp(char *, char *);

diff --git a/umon_main/target/glib/div.c b/umon_main/target/glib/div.c
index 02b9199..674348c 100644 (file)
--- a/umon_main/target/glib/div.c
+++ b/umon_main/target/glib/div.c
@@ -1,5 +1,5 @@
 #include "config.h"
-#include <stdlib.h>
+#include "genlib.h"
 
 div_t
 div(int num,int den)

diff --git a/umon_main/target/glib/ldiv.c b/umon_main/target/glib/ldiv.c
index d654d72..bb05598 100644 (file)
--- a/umon_main/target/glib/ldiv.c
+++ b/umon_main/target/glib/ldiv.c
@@ -1,5 +1,5 @@
 #include "config.h"
-#include <stdlib.h>
+#include "genlib.h"
 
 ldiv_t
 ldiv(long num,long den)

diff --git a/umon_main/target/glib/sprnfloat.c b/umon_main/target/glib/sprnfloat.c
index 7ada1b2..f5c2b0b 100644 (file)
--- a/umon_main/target/glib/sprnfloat.c
+++ b/umon_main/target/glib/sprnfloat.c
@@ -1,8 +1,6 @@
 #include <ctype.h>
 #include <float.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
+#include "genlib.h"
 
 extern int long_to_dec(long lval,char *buf,char *bufend,char *hdr);
 

diff --git a/umon_main/target/glib/strtod.c b/umon_main/target/glib/strtod.c
index 22cbd76..126dc69 100644 (file)
--- a/umon_main/target/glib/strtod.c
+++ b/umon_main/target/glib/strtod.c
@@ -33,8 +33,7 @@
 
 #include <ctype.h>
 #include <float.h>
-#include <stdlib.h>
-#include <math.h>
+#include "genlib.h"
 
 double strtod(const char *str, char **endptr)
 {

diff --git a/umon_main/target/misc/newlib_hooks.c b/umon_main/target/misc/newlib_hooks.c
index 926cf50..1946b7b 100644 (file)
--- a/umon_main/target/misc/newlib_hooks.c
+++ b/umon_main/target/misc/newlib_hooks.c
@@ -23,12 +23,12 @@
  */
 #include <stdio.h>
 #include <reent.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
+#include "genlib.h"
 #include "monlib.h"
 
 #define REENT struct _reent

diff --git a/umon_main/target/misc/newlib_main.c b/umon_main/target/misc/newlib_main.c
index 9c0a8fd..66a419e 100644 (file)
--- a/umon_main/target/misc/newlib_main.c
+++ b/umon_main/target/misc/newlib_main.c
@@ -3,8 +3,8 @@
  * of including the newlib_hooks.c file with a MicroMonitor application.
  */
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/stat.h>
+#include "genlib.h"
 #include "monlib.h"
 
 void