Cleanup use of predefined data types / defines

git-svn-id: svn://svn.cc65.org/cc65/trunk@2342 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/include/stddef.h b/include/stddef.h
index 3cb74017be2d38b2fa8fa0cadd309278bcdfaec4..4b04318ef05a7f7de69d5619cadd6784e38973cc 100644 (file)
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                stddef.h                                  */
+/*                                stddef.h                                  */
 /*                                                                           */
-/*                           Common definitions                             */
+/*                           Common definitions                             */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2002 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 1998-2003 Ullrich von Bassewitz                                       */
+/*               Römerstrasse 52                                             */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -39,24 +39,24 @@
 
 
 /* Standard data types */
-#ifndef _PTRDIFF_T
-#define _PTRDIFF_T
+#ifndef _HAVE_ptrdiff_t
+#define _HAVE_ptrdiff_t
 typedef int ptrdiff_t;
 #endif
-#ifndef _WCHAR_T
-#define _WCHAR_T
+#ifndef _HAVE_wchar_t
+#define _HAVE_wchar_t
 typedef unsigned short wchar_t;
 #endif
-#ifndef _SIZE_T
-#define _SIZE_T
+#ifndef _HAVE_size_t
+#define _HAVE_size_t
 typedef unsigned size_t;
 #endif
 
 /* NULL pointer */
-#ifdef NULL
-#  undef NULL
-#endif
+#ifndef _HAVE_NULL
 #define NULL   0
+#define _HAVE_NULL
+#endif
 
 /* offsetof macro */
 #define offsetof(type, member) (size_t) (&((type*) 0)->member)
@@ -68,4 +68,3 @@ typedef unsigned size_t;
 
 
 
-

diff --git a/include/stdlib.h b/include/stdlib.h
index c7e5cf07c69ab3ff9827aa78f66cdd9ace62f847..7242557fee1c56e45a01f3700270db4e0a9eb688 100644 (file)
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2002 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 1998-2003 Ullrich von Bassewitz                                       */
+/*               Römerstrasse 52                                             */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -38,9 +38,11 @@
 
 
 
-#include <stddef.h>
-
-
+/* size_t is needed */
+#ifndef _HAVE_size_t
+typedef unsigned size_t;
+#define _HAVE_size_t
+#endif
 
 /* Standard exit codes */
 #define EXIT_SUCCESS   0

diff --git a/include/time.h b/include/time.h
index 678231685b02a4363a9036b8edb7760ee861d206..cdb914447b661d9c6b4bd2113064a612424fb724 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2002 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 1998-2003 Ullrich von Bassewitz                                       */
+/*               Römerstrasse 52                                             */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -39,14 +39,14 @@
 
 
 /* NULL pointer */
-#ifdef NULL
-#  undef NULL
-#endif
+#ifdef _HAVE_NULL   
 #define NULL   0
+#define _HAVE_NULL
+#endif
 
 /* size_t is needed */
-#ifndef _SIZE_T
-#define _SIZE_T
+#ifndef _HAVE_size_t
+#define _HAVE_size_t
 typedef unsigned size_t;
 #endif
 

diff --git a/include/unistd.h b/include/unistd.h
index e7ce5025ec8ef23a63eef3924e12a545d1733a63..15c118a8c83008452b24132ab5042f9908238231 100644 (file)
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -37,7 +37,7 @@
 #define _UNISTD_H
 
 
-                                                   
+
 /*****************************************************************************/
 /*                                  Data                                    */
 /*****************************************************************************/
@@ -49,9 +49,15 @@
 #define STDOUT_FILENO  1
 #define STDERR_FILENO  2
 
+/* WE need size_t */
+#ifndef _HAVE_size_t
+#define _HAVE_size_t
+typedef unsigned size_t;
+#endif
+
 /* We need off_t if sys/types is not included */
-#ifndef __HAVE_off_t
-#define __HAVE_off_t
+#ifndef _HAVE_off_t
+#define _HAVE_off_t
 typedef long int off_t;
 #endif
 

diff --git a/libsrc/common/system.c b/libsrc/common/system.c
index c4c8bd3c5857612ef5b0577c588ebe01e56f17b8..c6bfb667c106cc12f6bcfe68be120bbcd64f683f 100644 (file)
--- a/libsrc/common/system.c
+++ b/libsrc/common/system.c
@@ -5,6 +5,7 @@
  * Ullrich von Bassewitz, 2003-05-27
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 
 int system (const char* s)