From: Bruce Momjian <bruce@momjian.us>
Date: Sat, 17 Jul 1999 04:12:10 +0000 (+0000)
Subject: More config.h cleanups.
X-Git-Tag: REL9_0_0~25061
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8f5561a0d96b110c593dab2b11ff08fd2ba826d7;p=pg-rex%2Fsyncrep.git

More config.h cleanups.
---

diff --git a/src/backend/port/inet_aton.c b/src/backend/port/inet_aton.c
index 2922c137ca..485772619c 100644
--- a/src/backend/port/inet_aton.c
+++ b/src/backend/port/inet_aton.c
@@ -1,4 +1,4 @@
-/* $Id: inet_aton.c,v 1.16 1999/02/07 22:07:02 tgl Exp $
+/* $Id: inet_aton.c,v 1.17 1999/07/17 04:12:09 momjian Exp $
  *
  *	This inet_aton() function was taken from the GNU C library and
  *	incorporated into Postgres for those systems which do not have this
@@ -42,12 +42,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.  */
 
-#include "config.h"
-
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <ctype.h>
 
+#include "config.h"
+
 /*
  * Check whether "cp" is a valid ascii representation
  * of an Internet address and convert to a binary address.
diff --git a/src/include/c.h b/src/include/c.h
index 84516a0f8f..1fd1aa0421 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.59 1999/07/13 20:00:32 momjian Exp $
+ * $Id: c.h,v 1.60 1999/07/17 04:12:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,6 +46,10 @@
    on some platforms, and we only want our definitions used if stdlib.h doesn't
    have its own.  The same goes for stddef and stdarg if present.
 */
+
+#include "config.h"
+
+
 #include <stdlib.h>
 #ifdef STDC_HEADERS
 #include <stddef.h>
@@ -104,12 +108,6 @@ typedef bool *BoolPtr;
  */
 
 /*
- * We used to define const, signed, volatile, and inline as empty
- * if __STDC__ wasn't defined.  Now we let configure test whether
- * those keywords work; config.h defines them as empty if not.
- */
-
-/*
  * CppAsString
  *		Convert the argument to a string, using the C preprocessor.
  * CppConcat
diff --git a/src/include/postgres.h b/src/include/postgres.h
index 5584aee242..ad6cda6795 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1995, Regents of the University of California
  *
- * $Id: postgres.h,v 1.25 1999/07/16 17:07:24 momjian Exp $
+ * $Id: postgres.h,v 1.26 1999/07/17 04:12:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,9 +36,6 @@
 #define POSTGRES_H
 
 #include "postgres_ext.h"
-#ifndef WIN32
-#include "config.h"
-#endif
 #include "c.h"
 #include "utils/elog.h"
 #include "utils/mcxt.h"