* src/acconfig.h: Don't protect config.h against multiple

inclusion.
Don't define PARAMS.
* src/system.h: Define PARAMS.
Remove some of the ad-hoc CPP magic for DOS, VMS etc.: this is the
purpose of config.h.  system.h must not try to fix wrong
definitions in config.h.

diff --git a/ChangeLog b/ChangeLog
index 729640e3e944fa7bd1ce5fa333e81653c5814e56..0ffd0ecff1761354c405e1c7c13087697f2eabda 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-09-20  Akim Demaille  <akim@epita.fr>
+
+       * src/acconfig.h: Don't protect config.h against multiple
+       inclusion.
+       Don't define PARAMS.
+       * src/system.h: Define PARAMS.
+       Remove some of the ad-hoc CPP magic for DOS, VMS etc.: this is the
+       purpose of config.h.  system.h must not try to fix wrong
+       definitions in config.h.
+
 2000-09-20  Akim Demaille  <akim@epita.fr>
 
        * src/derives.h: New file.

diff --git a/acconfig.h b/acconfig.h
index 0fc2bdd0637d5e6f832eed14fb0380b9548e46e9..9e84572ec7167816e94de69119e4110db3d9d96e 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,7 +1,3 @@
-#ifndef CONFIG_H
-#define CONFIG_H
-@TOP@
-
 /* Define as 1 if realloc must be declared even if <stdlib.h> is
    included.  */
 #undef NEED_DECLARATION_REALLOC
@@ -9,12 +5,3 @@
 /* Define as 1 if calloc must be declared even if <stdlib.h> is
    included.  */
 #undef NEED_DECLARATION_CALLOC
-@BOTTOM@
-
-#if defined(PROTOTYPES) || defined(__cplusplus)
-# define PARAMS(p) p
-#else
-# define PARAMS(p) ()
-#endif
-
-#endif  /* CONFIG_H */

diff --git a/src/system.h b/src/system.h
index 9c8ac08e281b8e8a0929ae3ff0fa7fd938c1b4e9..56a0ba0ea9b548c353804822c03e3373c310300a 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -34,18 +34,14 @@
 # define getpid _getpid
 #endif
 
-#if defined(HAVE_STDLIB_H) || defined(MSDOS)
+#if HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
 
-#if defined(HAVE_UNISTD_H)
+#if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
-#if (defined(VMS) || defined(MSDOS)) && !defined(HAVE_STRING_H)
-# define HAVE_STRING_H 1
-#endif
-
 #if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 # include <string.h>
 /* An ANSI string.h and pre-ANSI memory.h might conflict.  */
@@ -69,6 +65,11 @@
 extern int errno;
 #endif
 
+#if PROTOTYPES
+# define PARAMS(p) p
+#else
+# define PARAMS(p) ()
+#endif
 
 /*-----------------.
 | GCC extensions.  |