Avoid duplicate type definitions, especially wchar_t which was inconsstent and caused...

diff --git a/include/stdlib.h b/include/stdlib.h
index 3d74ee6a0be52e12b96be2e82ddd70a24adb599d..56a72f14b9a1fff03752848a484cff2a7c317e92 100644 (file)
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -7,6 +7,7 @@
 #include <ansi.h>
 #endif
 
+#include <stddef.h>
 #include <sys/null.h>
 
 #define EXIT_FAILURE       1   /* standard error return using exit() */
@@ -17,16 +18,7 @@
 typedef struct { int quot, rem; } div_t;
 typedef struct { long quot, rem; } ldiv_t;
 
-/* The types are size_t, wchar_t, div_t, and ldiv_t. */
-#ifndef _SIZE_T
-#define _SIZE_T
-typedef unsigned int size_t;   /* type returned by sizeof */
-#endif
-
-#ifndef _WCHAR_T
-#define _WCHAR_T
-typedef char wchar_t;          /* type expanded character set */
-#endif
+/* The types are div_t, and ldiv_t. */
 
 /* Function Prototypes. */
 _PROTOTYPE( void abort, (void)                                         );

diff --git a/include/wchar.h b/include/wchar.h
index b40962c93f9e048bfca2a0cc686734e79817051c..56bc15b91673146f9398eb3ae1d5a90b7491ce04 100644 (file)
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -58,6 +58,7 @@
 
 #include <ansi.h>
 #include <stdarg.h>
+#include <stddef.h>
 
 #include <stdio.h> /* for FILE* */
 
@@ -70,11 +71,6 @@ typedef union {
     char __mbstate8[128];
 } __mbstate_t;
 
-#ifndef        _WCHAR_T
-#define        _WCHAR_T
-typedef        int wchar_t;
-#endif
-
 #ifndef        _MBSTATE_T
 #define        _MBSTATE_T
 typedef        __mbstate_t mbstate_t;
@@ -87,11 +83,6 @@ typedef      int wint_t;
 #endif
 
 
-#ifndef _SIZE_T
-#define _SIZE_T
-typedef unsigned int size_t;   /* type returned by sizeof */
-#endif
-
 struct tm;
 
 #ifdef __ACK__

diff --git a/include/wctype.h b/include/wctype.h
index eaaf0e00bc264f22443c45fd2c76a6b9d88b9749..b5b78be4b6ce5ef818367022c88d3423118f4733 100644 (file)
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -30,29 +30,14 @@
 #define        _WCTYPE_H_
 
 #include <ansi.h>
-
-#ifndef        _WCHAR_T
-#define        _WCHAR_T
-typedef        int wchar_t;
-#endif
+#include <stddef.h>
+#include <wchar.h>
 
 #ifndef        _WCTYPE_T
 #define        _WCTYPE_T
 typedef        void *wctype_t;
 #endif
 
-#ifndef        _WINT_T
-#define        _WINT_T
-typedef        int wint_t;
-#endif
-
-
-#ifndef _SIZE_T
-#define _SIZE_T
-typedef unsigned int size_t;   /* type returned by sizeof */
-#endif
-
-
 #ifndef        _WCTRANS_T
 #define        _WCTRANS_T
 typedef        void *wctrans_t;

diff --git a/servers/iso9660fs/const.h b/servers/iso9660fs/const.h
index 427da93631f6ccd57a1379a7c31d0095d072b8c7..f6cde19948ff9c89e62b088f3eefc7e902aac4a8 100644 (file)
--- a/servers/iso9660fs/const.h
+++ b/servers/iso9660fs/const.h
@@ -62,8 +62,6 @@
 
 #define END_OF_FILE   (-104)   /* eof detected */
 
-#define        offsetof(type, field)   ((size_t)(&((type *)0)->field))
-
 /* Miscellaneous constants */
 #define SYS_UID  ((uid_t) 0)   /* uid_t for processes PM and INIT */
 #define SYS_GID  ((gid_t) 0)   /* gid_t for processes PM and INIT */