merge changes from SQUID_2_3 branch

[thirdparty/squid.git] / src / squid.h

diff --git a/src/squid.h b/src/squid.h
index c223d6a679903d4148d23675d3a8bb8794895d5c..02f93459070c1562d26ad3969e7b9d0880d7c2bf 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.195 1999/10/04 05:05:27 wessels Exp $
+ * $Id: squid.h,v 1.196 1999/12/30 17:36:50 wessels Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -186,6 +186,9 @@
 #if HAVE_GETOPT_H
 #include <getopt.h>
 #endif
+#if HAVE_LIMITS_H
+#include <limits.h>
+#endif
 
 #if HAVE_DIRENT_H
 #include <dirent.h>
@@ -233,6 +236,7 @@
 #ifdef HAVE_SYSLOG_H
 #ifdef _SQUID_AIX_
 #define _XOPEN_EXTENDED_SOURCE
+#define _XOPEN_SOURCE_EXTENDED 1
 #endif
 #include <syslog.h>
 #endif
@@ -374,7 +378,7 @@ struct rusage {
 /*
  * Mac OS X Server already has radix.h as a standard header, so
  * this causes conflicts.
-*/
+ */
 #ifndef _SQUID_APPLE_
 #include "radix.h"
 #endif