[svn] Do the namespace tweaks only on systems we know about.

diff --git a/src/ChangeLog b/src/ChangeLog
index 862b7766b6e0e3d915cb0b7cf5a8924f03f6408a..da546b28fce2fc73b741b4701b84f722eb5768bb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2001-04-06  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * utils.c (read_file): Cast MAP_FAILED to char *.  Enforced by
+       Digital Unix cc.
+
+2001-04-06  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * config.h.in: Oops, do the namespace tweaks only on systems we
+       know about.
+
 2001-04-06  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * hash.c: Include <string.h>.

diff --git a/src/config.h.in b/src/config.h.in
index 8d3b46625d7e60cab504503f775ad35a0105ee18..f7281947469eaf2cd4573d0f292af06160f208f8 100644 (file)
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -200,10 +200,30 @@ char *alloca ();
 /* Define if all libs needed for ssl support are existing */
 #undef HAVE_SSL
 
+/* First a gambit to see whether we're on Solaris.  We'll
+   need it below.  */
+#ifdef __sun
+# ifdef __SVR4
+#  define solaris
+# endif
+#endif
+
 /* The following several lines can be very dangerous; they can cripple
-   the header files and break compilation in _verY_ non-obvious ways.  If
-   compilation fails mysteriously and the errors are reported in
-   system headers, try commenting these out.  */
+   the header files and break compilation in _verY_ non-obvious ways.
+   Because of that, we define them only on architectures we know
+   about.  */
+
+#undef NAMESPACE_TWEAKS
+
+#ifdef solaris
+# define NAMESPACE_TWEAKS
+#endif
+
+#ifdef __linux__
+# define NAMESPACE_TWEAKS
+#endif
+
+#ifdef NAMESPACE_TWEAKS
 
 /* Request the "Unix 98 compilation environment". */
 #define _XOPEN_SOURCE 500
@@ -217,4 +237,6 @@ char *alloca ();
 #define _SVID_SOURCE
 #define _BSD_SOURCE
 
+#endif /* NAMESPACE_TWEAKS */
+
 #endif /* CONFIG_H */