use STDC_HEADERS instead of __STDC__ as recommend by autoconf documentation

diff --git a/include/GNUregex.h b/include/GNUregex.h
index 4dc21af3fd185c785ce0f3516a57a5d041fb00b7..d234dc3201912ab1c335ab5a33b408223ba8d893 100644 (file)
--- a/include/GNUregex.h
+++ b/include/GNUregex.h
@@ -1,5 +1,5 @@
 /*
- * $Id: GNUregex.h,v 1.5 1998/09/23 17:19:56 wessels Exp $
+ * $Id: GNUregex.h,v 1.6 1999/01/11 21:55:33 wessels Exp $
  */
 
 /* Definitions for data structures and routines for the regular
@@ -389,7 +389,7 @@ typedef struct {
  * unfortunately clutters up the declarations a bit, but I think it's
  * worth it.  */
 
-#ifdef __STDC__
+#if STDC_HEADERS
 
 #define _RE_ARGS(args) args
 

diff --git a/include/snmp_debug.h b/include/snmp_debug.h
index 78659b1b1d140b9550f474cd1ad9db6476926c07..154dab8bef50dd015b3bfd9291fb47655e28a84a 100644 (file)
--- a/include/snmp_debug.h
+++ b/include/snmp_debug.h
@@ -1,11 +1,11 @@
 /*
- * $Id: snmp_debug.h,v 1.5 1998/09/23 17:20:02 wessels Exp $
+ * $Id: snmp_debug.h,v 1.6 1999/01/11 21:55:34 wessels Exp $
  */
 
 #ifndef SNMP_DEBUG_H
 #define SNMP_DEBUG_H
 
-#ifdef __STDC__
+#if STDC_HEADERS
 extern void snmplib_debug(int, char *,...);
 #else
 extern void snmplib_debug(va_alist);

diff --git a/snmplib/snmplib_debug.c b/snmplib/snmplib_debug.c
index 976d1f546b575dbcbb3f68fac7dcd006b95e53e0..6d78443e8eb70aee7f0d27f9c980a5bf0009d22a 100644 (file)
--- a/snmplib/snmplib_debug.c
+++ b/snmplib/snmplib_debug.c
@@ -5,7 +5,7 @@
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#ifdef __STDC__
+#if STDC_HEADERS
 #include <stdarg.h>
 #else
 #include <varargs.h>
@@ -15,14 +15,14 @@
 #include "snprintf.h"
 #endif
 
-#ifdef __STDC__
+#if STDC_HEADERS
 void (*snmplib_debug_hook) (int, char *,...) = NULL;
 #else
 void (*snmplib_debug_hook) (va_alist) = NULL;
 #endif
 
 extern void
-#ifdef __STDC__
+#if STDC_HEADERS
 snmplib_debug(int lvl, char *fmt,...)
 {
     char buf[BUFSIZ];

diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc
index 438cdcecbb0c8b149496894dc86c0df0889e708b..47a980e7e08ba4421ace92814d133fe2f974ccf8 100644 (file)
--- a/src/HttpHeaderTools.cc
+++ b/src/HttpHeaderTools.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: HttpHeaderTools.cc,v 1.21 1998/07/22 20:36:47 wessels Exp $
+ * $Id: HttpHeaderTools.cc,v 1.22 1999/01/11 21:55:36 wessels Exp $
  *
  * DEBUG: section 66    HTTP Header Tools
  * AUTHOR: Alex Rousskov
@@ -111,7 +111,7 @@ httpHeaderIdByName(const char *name, int name_len, const HttpHeaderFieldInfo * i
 }
 
 /* same as httpHeaderPutStr, but formats the string using snprintf first */
-#ifdef __STDC__
+#if STDC_HEADERS
 void
 httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...)
 {

diff --git a/src/MemBuf.cc b/src/MemBuf.cc
index 5e8f38637184b81f6355d8199abd0d510f2e20bf..c2c9d045e0b56bab3a3b8c670835d8d5ffe53203 100644 (file)
--- a/src/MemBuf.cc
+++ b/src/MemBuf.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: MemBuf.cc,v 1.20 1998/09/02 04:00:42 wessels Exp $
+ * $Id: MemBuf.cc,v 1.21 1999/01/11 21:55:37 wessels Exp $
  *
  * DEBUG: section 59    auto-growing Memory Buffer with printf
  * AUTHOR: Alex Rousskov
@@ -203,7 +203,7 @@ memBufAppend(MemBuf * mb, const char *buf, mb_size_t sz)
 }
 
 /* calls memBufVPrintf */
-#ifdef __STDC__
+#if STDC_HEADERS
 void
 memBufPrintf(MemBuf * mb, const char *fmt,...)
 {

diff --git a/src/Packer.cc b/src/Packer.cc
index 928acdfebed80fcd212308f41ec47570e7424e93..6d7959021e6c978bfa68d5ad5446ca03174c7e8c 100644 (file)
--- a/src/Packer.cc
+++ b/src/Packer.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: Packer.cc,v 1.9 1998/07/22 20:36:53 wessels Exp $
+ * $Id: Packer.cc,v 1.10 1999/01/11 21:55:37 wessels Exp $
  *
  * DEBUG: section 60    Packer: A uniform interface to store-like modules
  * AUTHOR: Alex Rousskov
@@ -141,7 +141,7 @@ packerAppend(Packer * p, const char *buf, int sz)
     p->append(p->real_handler, buf, sz);
 }
 
-#ifdef __STDC__
+#if STDC_HEADERS
 void
 packerPrintf(Packer * p, const char *fmt,...)
 {

diff --git a/src/debug.cc b/src/debug.cc
index f0bb9d00f458fde07542d2c27e756abe180450ae..4fa3c5c789662dbd42627e51286380ee8e08e2a8 100644 (file)
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: debug.cc,v 1.73 1998/11/25 09:00:20 wessels Exp $
+ * $Id: debug.cc,v 1.74 1999/01/11 21:55:38 wessels Exp $
  *
  * DEBUG: section 0     Debug Routines
  * AUTHOR: Harvest Derived
@@ -40,7 +40,7 @@ static int Ctx_Lock = 0;
 static const char *debugLogTime(time_t);
 static void ctx_print();
 
-#ifdef __STDC__
+#if STDC_HEADERS
 void
 _db_print(const char *format,...)
 {
@@ -61,7 +61,7 @@ _db_print(va_alist)
     LOCAL_ARRAY(char, tmpbuf, BUFSIZ);
 #endif
 
-#ifdef __STDC__
+#if STDC_HEADERS
     va_start(args, format);
 #if defined(__QNX__)
     va_start(eargs, format);

diff --git a/src/protos.h b/src/protos.h
index bf3e6a3dc795eabdb8a89778b4d19553a880ea59..2bcd9f609a729fd29e2a95b6f76e9ac4dcce8203 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.298 1999/01/11 16:50:37 wessels Exp $
+ * $Id: protos.h,v 1.299 1999/01/11 21:55:39 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -171,7 +171,7 @@ extern void packerToStoreInit(Packer * p, StoreEntry * e);
 extern void packerToMemInit(Packer * p, MemBuf * mb);
 extern void packerClean(Packer * p);
 extern void packerAppend(Packer * p, const char *buf, int size);
-#ifdef __STDC__
+#if STDC_HEADERS
 extern void packerPrintf(Packer * p, const char *fmt,...);
 #else
 extern void packerPrintf();
@@ -185,7 +185,7 @@ extern void ctx_exit(Ctx ctx);
 extern void _db_init(const char *logfile, const char *options);
 extern void _db_rotate_log(void);
 
-#ifdef __STDC__
+#if STDC_HEADERS
 extern void _db_print(const char *,...);
 #else
 extern void _db_print();
@@ -361,7 +361,7 @@ extern const char *getStringPrefix(const char *str, const char *end);
 extern int httpHeaderParseInt(const char *start, int *val);
 extern int httpHeaderParseSize(const char *start, size_t * sz);
 extern int httpHeaderReset(HttpHeader * hdr);
-#ifdef __STDC__
+#if STDC_HEADERS
 extern void httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...);
 #else
 extern void
@@ -541,7 +541,7 @@ extern int memBufIsNull(MemBuf * mb);
 /* calls memcpy, appends exactly size bytes, extends buffer if needed */
 extern void memBufAppend(MemBuf * mb, const char *buf, mb_size_t size);
 /* calls snprintf, extends buffer if needed */
-#ifdef __STDC__
+#if STDC_HEADERS
 extern void memBufPrintf(MemBuf * mb, const char *fmt,...);
 #else
 extern void memBufPrintf();
@@ -800,7 +800,7 @@ extern void storeBuffer(StoreEntry *);
 extern void storeBufferFlush(StoreEntry *);
 extern void storeHashInsert(StoreEntry * e, const cache_key *);
 extern void storeSetMemStatus(StoreEntry * e, int);
-#ifdef __STDC__
+#if STDC_HEADERS
 extern void storeAppendPrintf(StoreEntry *, const char *,...);
 #else
 extern void storeAppendPrintf();
@@ -932,7 +932,7 @@ extern const char *uniqueHostname(void);
 extern void safeunlink(const char *path, int quiet);
 extern void death(int sig);
 extern void fatal(const char *message);
-#ifdef __STDC__
+#if STDC_HEADERS
 extern void fatalf(const char *fmt,...);
 #else
 extern void fatalf();

diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index fbc33376004d8a899e20ba31c4a193beeafba267..acf53db7863844861e5b887482d6ecfb6a93388a 100644 (file)
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: snmp_core.cc,v 1.24 1998/12/08 20:30:10 glenn Exp $
+ * $Id: snmp_core.cc,v 1.25 1999/01/11 21:55:40 wessels Exp $
  *
  * DEBUG: section 49    SNMP support
  * AUTHOR: Glenn Chisholm
@@ -50,7 +50,7 @@ typedef struct _mib_tree_entry mib_tree_entry;
 
 mib_tree_entry *mib_tree_head;
 
-#ifdef __STDC__
+#if STDC_HEADERS
 static mib_tree_entry *snmpAddNode(oid * name, int len, oid_ParseFn * parsefunction, int children,...);
 static oid *snmpCreateOid(int length,...);
 #else
@@ -813,7 +813,7 @@ snmpTreeEntry(oid entry, snint len, mib_tree_entry * current)
 /*
  * Adds a node to the MIB tree structure and adds the appropriate children
  */
-#ifdef __STDC__
+#if STDC_HEADERS
 mib_tree_entry *
 snmpAddNode(oid * name, int len, oid_ParseFn * parsefunction, int children,...)
 {
@@ -864,7 +864,7 @@ snmpAddNode(va_alist)
 /* 
  * Returns the list of parameters in an oid[]
  */
-#ifdef __STDC__
+#if STDC_HEADERS
 oid *
 snmpCreateOid(int length,...)
 {

diff --git a/src/squid.h b/src/squid.h
index 3078f0ba5f050f647ffa18ef8817ef2bdcc26e4d..af8f811e8810d65334db4020a207bad58ceacb1e 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.182 1998/12/11 23:48:38 wessels Exp $
+ * $Id: squid.h,v 1.183 1999/01/11 21:55:41 wessels Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -70,7 +70,7 @@
 
 #if PURIFY
 #define assert(EX) ((void)0)
-#elif __STDC__
+#elif STDC_HEADERS
 #define assert(EX)  ((EX)?((void)0):xassert( # EX , __FILE__, __LINE__))
 #else
 #define assert(EX)  ((EX)?((void)0):xassert("EX", __FILE__, __LINE__))
@@ -212,7 +212,7 @@
 #endif /* HAVE_POLL_H */
 #endif /* HAVE_POLL */
 
-#ifdef __STDC__
+#if STDC_HEADERS
 #include <stdarg.h>
 #else
 #include <varargs.h>

diff --git a/src/store.cc b/src/store.cc
index 5ae246556857cc3d1574a6e3f0c9b4bcc6a6fd62..294ba834ce597bad6a1fd189b5efff2c20581e0b 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.476 1999/01/11 16:50:41 wessels Exp $
+ * $Id: store.cc,v 1.477 1999/01/11 21:55:43 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager
  * AUTHOR: Harvest Derived
@@ -419,7 +419,7 @@ storeAppend(StoreEntry * e, const char *buf, int len)
 #endif
 }
 
-#ifdef __STDC__
+#if STDC_HEADERS
 void
 storeAppendPrintf(StoreEntry * e, const char *fmt,...)
 {

diff --git a/src/tools.cc b/src/tools.cc
index 0e8e592b974ece20250ccc1aa1cb2ddd0f1b4d84..65f8ebcecb9e2eabb0007605f0da577df516a951 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.172 1998/11/13 06:00:32 wessels Exp $
+ * $Id: tools.cc,v 1.173 1999/01/11 21:55:44 wessels Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -326,7 +326,7 @@ fatal(const char *message)
 }
 
 /* printf-style interface for fatal */
-#ifdef __STDC__
+#if STDC_HEADERS
 void
 fatalf(const char *fmt,...)
 {

diff --git a/src/typedefs.h b/src/typedefs.h
index f38f90afe57daceb3e74bdf5b0c3670a0eb2edbc..0f2dbfaa613fa23ffa5b749e644a1ce576b61094 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.83 1998/12/05 00:54:47 wessels Exp $
+ * $Id: typedefs.h,v 1.84 1999/01/11 21:55:45 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -204,7 +204,7 @@ typedef void StatHistBinDumper(StoreEntry *, int idx, double val, double size, i
 
 /* append/vprintf's for Packer */
 typedef void (*append_f) (void *, const char *buf, int size);
-#ifdef __STDC__
+#if STDC_HEADERS
 typedef void (*vprintf_f) (void *, const char *fmt, va_list args);
 #else
 typedef void (*vprintf_f) ();