[svn] Fixed compilation under Ultrix.

diff --git a/src/ChangeLog b/src/ChangeLog
index adeb1c1e97af718a1baf15425b475eed4a130411..05861c9483e569e2d2c7d0d0c295fad64a505756 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-23  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * config.h.in: Deploy preprocessor magic to avoid Ultrix's
+       <netdb.h> include <bitypes.h> which defines its own u_int32_t.
+       Reported by Bernhard Simon.
+
 2003-10-23  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * version.c: Bump version.

diff --git a/src/config.h.in b/src/config.h.in
index 7be0706ceffebd60492cf62898be6be65dd90822..455f2c8da95e5f50b326a22df922b4d701051e47 100644 (file)
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -278,6 +278,10 @@ char *alloca ();
 /* Define if you have u_int32_t.  */
 #undef HAVE_U_INT32_T
 
+/* Some autoconf-unrelated preprocessor magic that cannot be in
+   sysdep.h because it must be done before including the system
+   headers.  */
+
 /* First a gambit to see whether we're on Solaris.  We'll
    need it below.  */
 #ifdef __sun
@@ -286,6 +290,17 @@ char *alloca ();
 # endif
 #endif
 
+/* Under Ultrix, u_int32_t is only defined when <sys/bitypes.h> is
+   included.  Therefore, configure doesn't pick it up, but files that
+   include <netdb.h> (or <resolv.h>) fail to compile because it includes
+   bitypes.h.  This magic define causes netdb.h/resolv.h not to include
+   bitypes.h under Ultrix.  */
+
+#ifdef __ultrix
+# define BSD 199306
+#endif
+
+
 /* The following several lines can be very dangerous; they can cripple
    the header files and break compilation in _verY_ non-obvious ways.
    Because of that, we define them only on architectures we know