3 files changed, 14 insertions, 16 deletions
diff --git a/src/include/c.h b/src/include/c.h
index 174d20cb1c4..53fe14e70a2 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.61 1999/07/17 20:18:25 momjian Exp $
+ * $Id: c.h,v 1.62 1999/12/20 00:51:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -789,11 +789,11 @@ extern char *vararg_format(const char *fmt,...);
  * in config.h we haven't yet included anything that defines size_t...
  */
 
-#ifndef HAVE_SNPRINTF
+#ifndef HAVE_SNPRINTF_DECL
 extern int	snprintf(char *str, size_t count, const char *fmt,...);
 #endif
 
-#ifndef HAVE_VSNPRINTF
+#ifndef HAVE_VSNPRINTF_DECL
 extern int	vsnprintf(char *str, size_t count, const char *fmt, va_list args);
 #endif
 
diff --git a/src/include/config.h.in b/src/include/config.h.in
index ef25d6ddcb3..00713b0b702 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -310,18 +310,24 @@
 # define gettimeofday(a,b) gettimeofday(a)
 #endif
 
-/* Set to 1 if you have snprintf() */
+/* Set to 1 if you have snprintf() in the C library */
 #undef HAVE_SNPRINTF
 
-/* Set to 1 if you have strerror() */
-#undef HAVE_STRERROR
+/* Set to 1 if your standard system headers declare snprintf() */
+#undef HAVE_SNPRINTF_DECL
 
-/* Set to 1 if you have vsnprintf() */
+/* Set to 1 if you have vsnprintf() in the C library */
 #undef HAVE_VSNPRINTF
 
+/* Set to 1 if your standard system headers declare vsnprintf() */
+#undef HAVE_VSNPRINTF_DECL
+
+/* Set to 1 if you have strerror() */
+#undef HAVE_STRERROR
+
 /*
  *	Set to 1 if you have isinf().
- *	These are all realated to port/isinf.c 
+ *	These are all related to port/isinf.c 
  */
 #undef HAVE_FPCLASS
 #undef HAVE_FP_CLASS
diff --git a/src/include/port/hpux.h b/src/include/port/hpux.h
index 0c42e6c4b76..4ef01af0958 100644
--- a/src/include/port/hpux.h
+++ b/src/include/port/hpux.h
@@ -6,14 +6,6 @@ typedef struct
 	int			sema[4];
 } slock_t;
 
-/* HPUX 9 has snprintf in the library, so configure will set HAVE_SNPRINTF;
- * but it doesn't provide a prototype for it.  To suppress warning messages
- * from gcc, do this to make c.h provide the prototype:
- */
-#ifndef HAVE_VSNPRINTF
-#undef HAVE_SNPRINTF
-#endif
-
 #ifndef			BIG_ENDIAN
 #define			BIG_ENDIAN		4321
 #endif