From 51c82cd8b3e691864cf16014bc249a701e618974 Mon Sep 17 00:00:00 2001 From: hniksic Date: Thu, 23 Oct 2003 08:25:34 -0700 Subject: [PATCH] [svn] Fixed compilation under Ultrix. --- src/ChangeLog | 6 ++++++ src/config.h.in | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index adeb1c1e..05861c94 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2003-10-23 Hrvoje Niksic + + * config.h.in: Deploy preprocessor magic to avoid Ultrix's + include which defines its own u_int32_t. + Reported by Bernhard Simon. + 2003-10-23 Hrvoje Niksic * version.c: Bump version. diff --git a/src/config.h.in b/src/config.h.in index 7be0706c..455f2c8d 100644 --- 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 is + included. Therefore, configure doesn't pick it up, but files that + include (or ) 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