Fix silly definition order in config.h --- we had prototypes like

extern int  inet_aton(const char *cp, struct in_addr * addr);
appearing before the optional #define for const, which was certain
to fail on a machine with neither const nor inet_aton().

diff --git a/src/include/config.h.in b/src/include/config.h.in
index 028acf81283da554090204c3626199592d990cd4..095cfe56d79ccb760a444a19aec39157a137730e 100644 (file)
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -8,7 +8,7 @@
  * or in config.h afterwards.  Of course, if you edit config.h, then your
  * changes will be overwritten the next time you run configure.
  *
- * $Id: config.h.in,v 1.111 2000/03/30 05:29:21 tgl Exp $
+ * $Id: config.h.in,v 1.112 2000/04/14 03:05:35 tgl Exp $
  */
 
 #ifndef CONFIG_H
@@ -61,26 +61,6 @@
  */
 #define RELSEG_SIZE    (0x40000000 / BLCKSZ)
 
-/* Set to 1 if you want to USE_LOCALE */
-#undef USE_LOCALE
-
-/* Set to 1 if you want CYR_RECODE (cyrillic recode) */
-#undef CYR_RECODE
-
-/* Set to 1 if you want to use multibyte characters */
-#undef MULTIBYTE
-
-/* Set to 1 if you want to Enable ASSERT CHECKING */
-#undef USE_ASSERT_CHECKING
-
-/* 
- * DEF_PGPORT is the TCP port number on which the Postmaster listens by
- * default.  This can be overriden by command options, environment variables,
- * and the postconfig hook. (now set by configure script)
- */ 
-
-#undef DEF_PGPORT 
-
 /*
  * As soon as the backend blocks on a lock, it waits this number of seconds
  * before checking for a deadlock.
@@ -221,13 +201,6 @@
  */
 #define DEFAULT_MAX_EXPR_DEPTH 10000
 
-/*
- * Leftover cruft for enabling long-since-verified patches.
- * You don't want to touch these.
- */
-#define INDEXSCAN_PATCH 
-#define FUNC_UTIL_PATCH
-
 
 /*
  *------------------------------------------------------------------------
@@ -235,6 +208,40 @@
  *------------------------------------------------------------------------
  */
 
+/* Set to 1 if you want to USE_LOCALE */
+#undef USE_LOCALE
+
+/* Set to 1 if you want CYR_RECODE (cyrillic recode) */
+#undef CYR_RECODE
+
+/* Set to 1 if you want to use multibyte characters */
+#undef MULTIBYTE
+
+/* Set to 1 if you want to Enable ASSERT CHECKING */
+#undef USE_ASSERT_CHECKING
+
+/* 
+ * DEF_PGPORT is the TCP port number on which the Postmaster listens by
+ * default.  This can be overriden by command options, environment variables,
+ * and the postconfig hook. (now set by configure script)
+ */ 
+#undef DEF_PGPORT 
+
+/* Define const as empty if your compiler doesn't grok const. */
+#undef const
+
+/* Define as your compiler's spelling of "inline", or empty if no inline. */
+#undef inline
+
+/* Define signed as empty if your compiler doesn't grok "signed char" etc */
+#undef signed
+
+/* Define volatile as empty if your compiler doesn't grok volatile. */
+#undef volatile
+
+/* Define if your cpp understands the ANSI stringizing operators in macros */
+#undef HAVE_STRINGIZE
+
 /* Set to 1 if you have <arpa/inet.h> */
 #undef HAVE_ARPA_INET_H
 
@@ -348,6 +355,7 @@
 #undef HAVE_FP_CLASS_H
 #undef HAVE_FP_CLASS_D
 #undef HAVE_CLASS
+
 #undef HAVE_ISINF
 #ifndef HAVE_ISINF
 int isinf(double x);
@@ -508,21 +516,6 @@ extern void srandom(unsigned int seed);
 #undef ALIGNOF_DOUBLE
 #undef MAXIMUM_ALIGNOF
 
-/* Define const as empty if your compiler doesn't grok const. */
-#undef const
-
-/* Define as your compiler's spelling of "inline", or empty if no inline. */
-#undef inline
-
-/* Define signed as empty if your compiler doesn't grok "signed char" etc */
-#undef signed
-
-/* Define volatile as empty if your compiler doesn't grok volatile. */
-#undef volatile
-
-/* Define if your cpp understands the ANSI stringizing operators in macros */
-#undef HAVE_STRINGIZE
-
 /* Define as the base type of the last arg to accept */
 #undef SOCKET_SIZE_TYPE