coar 99/04/28 12:43:57
Modified: apr/include apr_config.h.in
Log:
Glork. autoconf & configure don't miss a trick when it comes to
#undef..
Revision Changes Path
1.4 +11 -6 apache-apr/apr/include/apr_config.h.in
Index: apr_config.h.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/include/apr_config.h.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr_config.h.in 1999/04/28 19:20:01 1.3
+++ apr_config.h.in 1999/04/28 19:43:52 1.4
@@ -75,17 +75,14 @@
/*
* Known problems with system header files that we can fix.
*/
-#ifdef ULTRIX
-/*
- * We don't want to include Ultrix's sys/resource.h, even if it's
- * there.
- */
-#undef HAVE_SYS_RESOURCE_H
+
/*
* Versions of Ultrix prior to 4.3 included a bundled cc with a broken
* const. Don't try to use it; in fact, make sure it's define'd away
* before any header files try to use it.
*/
+#ifdef ULTRIX
+
#ifdef __ultrix__
#define const
#endif /* __ultrix__ */
@@ -271,9 +268,17 @@
#include <sys/param.h>
#endif /* HAVE SYS_PARAM_H */
+#ifndef ULTRIX
+/*
+ * We don't want to include Ultrix's sys/resource.h, even if it's
+ * there.
+ */
+
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
#endif /* HAVE_SYS_RESOURCE_H */
+
+#endif /* ULTRIX */
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
