Clean up Makefile(s)

Add #include "postgres.h" as required Remove #include "c.h" *and* "utils/elog.h" as applicable

Clean up Makefile(s)
Add #include "postgres.h" as required Remove #include "c.h" *and* "utils/elog.h" as applicable
6fac4602 · Marc G. Fournier · 66637f4a · 6fac4602 · 6fac4602 · 6fac4602
Commit 6fac4602 authored Nov 03, 1996 by Marc G. Fournier
25 changed files
--- a/src/backend/storage/ipc/Makefile
+++ b/src/backend/storage/ipc/Makefile
@@ -4,16 +4,14 @@
 #    Makefile for storage/ipc
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.1 1996/10/27 09:52:10 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.2 1996/11/03 05:06:52 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../port/$(PORTNAME) \
-              -I../../include \
+INCLUDE_OPT = -I../../port/$(PORTNAME) \
              -I../../../include

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.5 1996/10/31 10:20:06 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.6 1996/11/03 05:06:54 scrappy Exp $
 *
 * NOTES
 *
@@ -37,9 +37,9 @@
 #include <sys/shm.h>
 #endif

+#include "postgres.h"
 #include "storage/ipc.h"
 #include "utils/memutils.h"
-#include "utils/elog.h"

 #if defined(bsd44)
 int UsePrivateMemory = 1;

--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -7,15 +7,14 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.1.1.1 1996/07/09 06:21:54 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.2 1996/11/03 05:06:55 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
-#include "c.h"
+#include "postgres.h"

 #include "storage/ipc.h"
 #include "storage/multilev.h"
-#include "utils/elog.h"
 #include "storage/sinval.h"
 #include "storage/bufmgr.h"
 #include "storage/proc.h"

--- a/src/backend/storage/ipc/s_lock.c
+++ b/src/backend/storage/ipc/s_lock.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.5 1996/10/31 10:20:09 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.6 1996/11/03 05:06:56 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -40,6 +40,9 @@
 #ifdef WIN32
 #include <windows.h>
 #endif /* WIN32 */
+
+#include "postgres.h"
+
 #include "storage/ipc.h"



--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.2 1996/10/31 05:54:42 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.3 1996/11/03 05:06:57 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -65,7 +65,6 @@
 #include "storage/shmem.h"
 #include "storage/spin.h"
 #include "utils/hsearch.h"
-#include "utils/elog.h"

 /* shared memory global variables */


--- a/src/backend/storage/ipc/shmqueue.c
+++ b/src/backend/storage/ipc/shmqueue.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.1.1.1 1996/07/09 06:21:54 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.2 1996/11/03 05:06:58 scrappy Exp $
 *
 * NOTES
 *
@@ -25,7 +25,6 @@
 #include <stdio.h>		/* for sprintf() */
 #include "postgres.h"
 #include "storage/shmem.h"	/* where the declarations go */
-#include "utils/elog.h"

 /*#define SHMQUEUE_DEBUG*/
 #ifdef SHMQUEUE_DEBUG

--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -7,12 +7,13 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.2 1996/10/31 05:54:43 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.3 1996/11/03 05:06:59 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
 /* #define INVALIDDEBUG	1 */

+#include <sys/types.h>
 #include <sys/ipc.h>

 #include "postgres.h"
@@ -20,7 +21,6 @@
 #include "storage/sinval.h"
 #include "storage/sinvaladt.h"
 #include "storage/spin.h"
-#include "utils/elog.h"

 extern SISeg		*shmInvalBuffer;/* the shared buffer segment, set by*/
    	    	    	    	    	/*   SISegmentAttach()	    	    */

--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -7,14 +7,16 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.1.1.1 1996/07/09 06:21:54 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.2 1996/11/03 05:07:00 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
+
+#include "postgres.h"
+
 #include "storage/ipc.h"
 #include "storage/sinvaladt.h"
 #include "storage/lmgr.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"

 /* ----------------

--- a/src/backend/storage/ipc/spin.c
+++ b/src/backend/storage/ipc/spin.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.1.1.1 1996/07/09 06:21:55 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.2 1996/11/03 05:07:02 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -30,7 +30,6 @@
 #include "storage/shmem.h"
 #include "storage/spin.h"
 #include "storage/proc.h"
-#include "utils/elog.h"

 /* globals used in this file */
 IpcSemaphoreId	SpinLockId;

--- a/src/backend/storage/large_object/Makefile
+++ b/src/backend/storage/large_object/Makefile
@@ -4,16 +4,14 @@
 #    Makefile for storage/large_object
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.1 1996/10/27 09:52:20 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.2 1996/11/03 05:07:07 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../port/$(PORTNAME) \
-              -I../../include \
+INCLUDE_OPT = -I../../port/$(PORTNAME) \
              -I../../../include

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,13 +8,13 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.2 1996/08/26 06:31:45 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.3 1996/11/03 05:07:10 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
 #include <stdio.h>		/* for sprintf() */
 #include <sys/file.h>
-#include "c.h"
+#include "postgres.h"
 #include "libpq/libpq-fs.h"
 #include "access/genam.h"
 #include "access/heapam.h"
@@ -34,7 +34,6 @@
 #include "utils/rel.h"
 #include "utils/palloc.h"
 #include "storage/large_object.h"
-#include "utils/elog.h"
 #include "utils/syscache.h"
 #include "utils/builtins.h"	/* for namestrcpy() */
 #include "catalog/heap.h"

--- a/src/backend/storage/lmgr/Makefile
+++ b/src/backend/storage/lmgr/Makefile
@@ -4,16 +4,14 @@
 #    Makefile for storage/lmgr
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.1 1996/10/27 09:52:27 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.2 1996/11/03 05:07:19 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../port/$(PORTNAME) \
-              -I../../include \
+INCLUDE_OPT = -I../../port/$(PORTNAME) \
              -I../../../include

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.1.1.1 1996/07/09 06:21:56 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.2 1996/11/03 05:07:26 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -34,7 +34,6 @@
 #include "storage/multilev.h"
 #include "storage/lmgr.h"

-#include "utils/elog.h"
 #include "utils/palloc.h"
 #include "utils/rel.h"


--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.3 1996/10/11 03:22:56 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.4 1996/11/03 05:07:29 scrappy Exp $
 *
 * NOTES
 *    Outside modules can create a lock table and acquire/release
@@ -32,12 +32,12 @@
 *-------------------------------------------------------------------------
 */
 #include <stdio.h>		/* for sprintf() */
+#include "postgres.h"
 #include "storage/shmem.h"
 #include "storage/spin.h"
 #include "storage/proc.h"
 #include "storage/lock.h"
 #include "utils/hsearch.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
 #include "access/xact.h"


--- a/src/backend/storage/lmgr/multi.c
+++ b/src/backend/storage/lmgr/multi.c
@@ -12,7 +12,7 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.1.1.1 1996/07/09 06:21:56 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.2 1996/11/03 05:07:31 scrappy Exp $
 *
 * NOTES:
 *   (1) The lock.c module assumes that the caller here is doing
@@ -22,11 +22,11 @@
 */
 #include <stdio.h>
 #include <string.h>
+#include "postgres.h"
 #include "storage/lmgr.h"
 #include "storage/multilev.h"

 #include "utils/rel.h"
-#include "utils/elog.h"
 #include "miscadmin.h"		/* MyDatabaseId */



--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.6 1996/10/11 03:22:59 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.7 1996/11/03 05:07:32 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -46,7 +46,7 @@
 *      This is so that we can support more backends. (system-wide semaphore
 *      sets run out pretty fast.)                -ay 4/95
 *
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.6 1996/10/11 03:22:59 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.7 1996/11/03 05:07:32 scrappy Exp $
 */
 #include <sys/time.h>
 #ifndef WIN32
@@ -54,11 +54,12 @@
 #endif /* WIN32 */
 #include <string.h>
 #include <sys/types.h>
+
+#include "postgres.h"
 #include "libpq/pqsignal.h"	/* substitute for <signal.h> */

 #include "access/xact.h"
 #include "utils/hsearch.h"
-#include "utils/elog.h"

 #include "storage/buf.h"	
 #include "storage/lock.h"

--- a/src/backend/storage/lmgr/single.c
+++ b/src/backend/storage/lmgr/single.c
@@ -13,11 +13,14 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.1.1.1 1996/07/09 06:21:57 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.2 1996/11/03 05:07:33 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
 #include <string.h>
+
+#include "postgres.h"
+
 #include "storage/lmgr.h"	/* where the declarations go */
 #include "storage/lock.h"
 #include "storage/multilev.h"

--- a/src/backend/storage/page/Makefile
+++ b/src/backend/storage/page/Makefile
@@ -4,16 +4,14 @@
 #    Makefile for storage/page
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.1 1996/10/27 09:52:34 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.2 1996/11/03 05:07:43 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../port/$(PORTNAME) \
-              -I../../include \
+INCLUDE_OPT = -I../../port/$(PORTNAME) \
              -I../../../include

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -7,19 +7,18 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.1.1.1 1996/07/09 06:21:58 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.2 1996/11/03 05:07:44 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
 #include <sys/types.h>
 #include <sys/file.h>

-#include "c.h"
+#include "postgres.h"

 #include "storage/item.h"
 #include "storage/buf.h"
 #include "storage/bufmgr.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
 #include "utils/memutils.h"
 #include "storage/bufpage.h"

--- a/src/backend/storage/page/itemptr.c
+++ b/src/backend/storage/page/itemptr.c
@@ -7,11 +7,11 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/page/itemptr.c,v 1.1.1.1 1996/07/09 06:21:59 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/page/itemptr.c,v 1.2 1996/11/03 05:07:46 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
-#include "c.h"
+#include "postgres.h"

 #include "storage/block.h"
 #include "storage/off.h"

--- a/src/backend/storage/smgr/Makefile
+++ b/src/backend/storage/smgr/Makefile
@@ -4,16 +4,14 @@
 #    Makefile for storage/smgr
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.1 1996/10/27 09:52:40 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.2 1996/11/03 05:07:50 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../port/$(PORTNAME) \
-              -I../../include \
+INCLUDE_OPT = -I../../port/$(PORTNAME) \
              -I../../../include

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.5 1996/08/27 22:20:26 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.6 1996/11/03 05:07:55 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -17,12 +17,11 @@
 #include "postgres.h"
 #include "miscadmin.h"  /* for DataDir */

-#include "storage/smgr.h"	/* where the declarations go */
 #include "storage/block.h"
+#include "storage/smgr.h"	/* where the declarations go */
 #include "storage/fd.h"
 #include "utils/mcxt.h"
 #include "utils/rel.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
 #include "catalog/catalog.h"


--- a/src/backend/storage/smgr/mm.c
+++ b/src/backend/storage/smgr/mm.c
@@ -10,7 +10,7 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.2 1996/08/27 22:20:27 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.3 1996/11/03 05:07:57 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -27,7 +27,6 @@

 #include "utils/hsearch.h"
 #include "utils/rel.h"
-#include "utils/elog.h"
 #include "utils/memutils.h"

 /*

--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -10,7 +10,7 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.2 1996/08/27 22:20:28 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.3 1996/11/03 05:08:00 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -18,10 +18,9 @@
 #include "postgres.h"

 #include "storage/ipc.h"
-#include "storage/smgr.h"
 #include "storage/block.h"
+#include "storage/smgr.h"
 #include "utils/rel.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"

 typedef struct f_smgr {

--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.1.1.1 1996/07/09 06:21:59 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.2 1996/11/03 05:08:01 scrappy Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -15,7 +15,6 @@
 #include "postgres.h"

 #include "utils/builtins.h"	/* where the declarations go */
-#include "utils/elog.h"
 #include "utils/palloc.h"
 #include "storage/smgr.h"