about summary refs log tree commit diff stats
path: root/WWW/Library/Implementation
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>2001-11-08 20:59:59 -0500
committerThomas E. Dickey <dickey@invisible-island.net>2001-11-08 20:59:59 -0500
commit6cb04c09f063188e7dae5d1e5e5c69eb64703626 (patch)
tree46c2950351bf3f2cde1f610eae7bc9cfb52c5221 /WWW/Library/Implementation
parentf78e27712a4f44dbdf3c1532c3d1958989bf40a5 (diff)
downloadlynx-snapshots-6cb04c09f063188e7dae5d1e5e5c69eb64703626.tar.gz
snapshot of project "lynx", label v2-8-5dev_4
Diffstat (limited to 'WWW/Library/Implementation')
-rw-r--r--WWW/Library/Implementation/HTString.h2
-rw-r--r--WWW/Library/Implementation/HTUtils.h8
2 files changed, 6 insertions, 4 deletions
diff --git a/WWW/Library/Implementation/HTString.h b/WWW/Library/Implementation/HTString.h
index 53c52cd6..be1002be 100644
--- a/WWW/Library/Implementation/HTString.h
+++ b/WWW/Library/Implementation/HTString.h
@@ -69,7 +69,7 @@ extern char * HTNextField PARAMS ((char** pstr));
 extern char * HTNextTok PARAMS((char ** pstr,
 		      CONST char * delims, CONST char * bracks, char * found));
 
-#if ANSI_VARARGS
+#ifdef ANSI_VARARGS
 extern char * HTSprintf (char ** pstr, CONST char * fmt, ...)
 			GCC_PRINTFLIKE(2,3);
 extern char * HTSprintf0 (char ** pstr, CONST char * fmt, ...)
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index e038e1b7..b006913a 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -411,7 +411,7 @@ are generally not the response status from any specific protocol.
 #define HT_BAD_EOF      -12             /* Premature EOF */
 
 #ifndef va_arg
-# if HAVE_STDARG_H && ANSI_VARARGS
+# if defined(HAVE_STDARG_H) && defined(ANSI_VARARGS)
 #  include <stdarg.h>
 # else
 #  if HAVE_VARARGS_H
@@ -420,7 +420,7 @@ are generally not the response status from any specific protocol.
 # endif
 #endif
 
-#if ANSI_VARARGS
+#if defined(ANSI_VARARGS)
 #define LYva_start(ap,format) va_start(ap,format)
 #else
 #define LYva_start(ap,format) va_start(ap)
@@ -430,11 +430,13 @@ are generally not the response status from any specific protocol.
  * GCC can be told that some functions are like printf (and do type-checking on
  * their parameters).
  */
-#if	GCC_PRINTF
+#ifndef GCC_PRINTFLIKE
+#if defined(GCC_PRINTF) && !defined(printf)
 #define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
 #else
 #define GCC_PRINTFLIKE(fmt,var) /*nothing*/
 #endif
+#endif
 
 #include <HTString.h>   /* String utilities */