4 files changed, 22 insertions, 22 deletions
diff --git a/src/include/Makefile b/src/include/Makefile
index 7d8a3e5b7f..a8aed3fdd7 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -6,7 +6,7 @@
 # programming.  'make install-all-headers' installs the whole contents
 # of src/include.
 #
-# $Header: /cvsroot/pgsql/src/include/Makefile,v 1.8 2001/03/01 16:17:53 petere Exp $
+# $Header: /cvsroot/pgsql/src/include/Makefile,v 1.9 2001/08/24 14:07:49 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,7 +18,7 @@ include $(top_builddir)/src/Makefile.global
 srcdir_headers := c.h postgres_ext.h postgres_fe.h \
 	libpq/pqcomm.h libpq/libpq-fs.h lib/dllist.h
 
-builddir_headers := os.h config.h
+builddir_headers := pg_config_os.h pg_config.h
 
 HEADERS = $(srcdir_headers) $(builddir_headers)
 
@@ -91,4 +91,4 @@ clean:
 	rm -f utils/fmgroids.h parser/parse.h
 
 distclean maintainer-clean: clean
-	rm -f config.h dynloader.h os.h stamp-h
+	rm -f pg_config.h dynloader.h pg_config_os.h stamp-h
diff --git a/src/include/c.h b/src/include/c.h
index d67dee12ac..fc95d381d3 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.98 2001/08/23 23:06:38 tgl Exp $
+ * $Id: c.h,v 1.99 2001/08/24 14:07:49 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,7 @@
  *
  *	  section	description
  *	  -------	------------------------------------------------
- *		0)		config.h and standard system headers
+ *		0)		pg_config.h and standard system headers
  *		1)		hacks to cope with non-ANSI C compilers
  *		2)		bool, true, false, TRUE, FALSE, NULL
  *		3)		standard system types
@@ -49,7 +49,7 @@
    have its own.  The same goes for stddef and stdarg if present.
 */
 
-#include "config.h"
+#include "pg_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -79,7 +79,7 @@
 /* ----------------------------------------------------------------
  *				Section 1: hacks to cope with non-ANSI C compilers
  *
- * type prefixes (const, signed, volatile, inline) are now handled in config.h.
+ * type prefixes (const, signed, volatile, inline) are handled in pg_config.h.
  * ----------------------------------------------------------------
  */
 
@@ -624,8 +624,8 @@ typedef NameData *Name;
 #endif
 
 /* Provide prototypes for routines not present in a particular machine's
- * standard C library.	It'd be better to put these in config.h, but
- * in config.h we haven't yet included anything that defines size_t...
+ * standard C library.	It'd be better to put these in pg_config.h, but
+ * in pg_config.h we haven't yet included anything that defines size_t...
  */
 
 #ifndef HAVE_SNPRINTF_DECL
diff --git a/src/include/config.h.in b/src/include/pg_config.h.in
index c0559089eb..c0984313e1 100644
--- a/src/include/config.h.in
+++ b/src/include/pg_config.h.in
@@ -1,18 +1,18 @@
 /*
  * PostgreSQL configuration-settings file.
  *
- * config.h.in is processed by configure to produce config.h.
+ * pg_config.h.in is processed by configure to produce pg_config.h.
  *
  * If you want to modify any of the tweakable settings in Part 2
- * of this file, you can do it in config.h.in before running configure,
- * or in config.h afterwards.  Of course, if you edit config.h, then your
+ * of this file, you can do it in pg_config.h.in before running configure,
+ * or in pg_config.h afterwards.  Of course, if you edit pg_config.h, then your
  * changes will be overwritten the next time you run configure.
  *
- * $Id: config.h.in,v 1.170 2001/08/01 23:52:50 tgl Exp $
+ * $Id: pg_config.h.in,v 1.1 2001/08/24 14:07:49 petere Exp $
  */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef PG_CONFIG_H
+#define PG_CONFIG_H
 
 
 /*
@@ -690,7 +690,7 @@ extern int fdatasync(int fildes);
  * Part 4: pull in system-specific declarations.
  *
  * This is still configure's responsibility, because it picks where
- * the "os.h" symlink points...
+ * the "pg_config_os.h" symlink points...
  *------------------------------------------------------------------------
  */
 
@@ -698,12 +698,12 @@ extern int fdatasync(int fildes);
  * Pull in OS-specific declarations (using link created by configure)
  */
 
-#include "os.h"
+#include "pg_config_os.h"
 
 /*
  * The following is used as the arg list for signal handlers.  Any ports
  * that take something other than an int argument should override this in
- * the port-specific os.h file.  Note that variable names are required
+ * the port-specific pg_config_os.h file.  Note that variable names are required
  * because it is used in both the prototypes as well as the definitions.
  * Note also the long name.  We expect that this won't collide with
  * other names causing compiler warnings.
@@ -714,4 +714,4 @@ extern int fdatasync(int fildes);
 #endif
 
 
-#endif /* CONFIG_H */
+#endif /* PG_CONFIG_H */
diff --git a/src/include/config.h.win32 b/src/include/pg_config.h.win32
index e8323b7736..b3977e90c2 100644
--- a/src/include/config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -1,8 +1,8 @@
 /*
- * Parts of config.h that you get with autoconf on other systems
+ * Parts of pg_config.h that you get with autoconf on other systems
  */
-#define PG_VERSION "7.2.0"
-#define PG_VERSION_STR "7.2.0 (win32)"
+#define PG_VERSION "7.2"
+#define PG_VERSION_STR "7.2 (win32)"
 
 #define SYSCONFDIR ""