This patch removes a bunch of superfluous #include directives: if

postgres.h or c.h includes a system header (such as stdio.h or
stdlib.h), there's no need to specifically include it in any of the .c
files in the backend.

Neil Conway

15 files changed, 11 insertions, 36 deletions

diff --git a/src/backend/port/beos/sem.c b/src/backend/port/beos/sem.c
index 6609f1dde00..f1d2c1c63fc 100644
--- a/src/backend/port/beos/sem.c
+++ b/src/backend/port/beos/sem.c
@@ -10,7 +10,6 @@
 
 
 #include "postgres.h"
-#include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 #include <OS.h>
diff --git a/src/backend/port/beos/shm.c b/src/backend/port/beos/shm.c
index 7903ce74ad9..94da461ea2c 100644
--- a/src/backend/port/beos/shm.c
+++ b/src/backend/port/beos/shm.c
@@ -9,7 +9,6 @@
  */
 
 #include "postgres.h"
-#include <stdio.h>
 #include <OS.h>
 #include <errno.h>
 
diff --git a/src/backend/port/darwin/system.c b/src/backend/port/darwin/system.c
index f66782eb363..a0c0801f2ab 100644
--- a/src/backend/port/darwin/system.c
+++ b/src/backend/port/darwin/system.c
@@ -37,11 +37,8 @@
 static char sccsid[] = "@(#)system.c	8.1 (Berkeley) 6/4/93";
 #endif   /* LIBC_SCCS and not lint */
 
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <signal.h>
-#include <stdlib.h>
-#include <stddef.h>
 #include <unistd.h>
 #include <paths.h>
 #include <errno.h>
diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c
index 97a916d8a30..a5d355c2cc2 100644
--- a/src/backend/port/dynloader/aix.c
+++ b/src/backend/port/dynloader/aix.c
@@ -6,7 +6,6 @@
 
 #include "postgres.h"
 
-#include <stdio.h>
 #include <errno.h>
 #include "sys/ldr.h"
 #include <a.out.h>
diff --git a/src/backend/port/dynloader/freebsd.c b/src/backend/port/dynloader/freebsd.c
index 763749fa450..9ad2cde2049 100644
--- a/src/backend/port/dynloader/freebsd.c
+++ b/src/backend/port/dynloader/freebsd.c
@@ -43,9 +43,6 @@ static char sccsid[] = "@(#)dl.c	5.4 (Berkeley) 2/23/91";
 #include <link.h>
 #include <dlfcn.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-
 static char error_message[BUFSIZ];
 
 char *
diff --git a/src/backend/port/dynloader/netbsd.c b/src/backend/port/dynloader/netbsd.c
index 2202b6847b4..3c950baddc0 100644
--- a/src/backend/port/dynloader/netbsd.c
+++ b/src/backend/port/dynloader/netbsd.c
@@ -42,9 +42,6 @@ static char sccsid[] = "@(#)dl.c	5.4 (Berkeley) 2/23/91";
 #include <link.h>
 #include <dlfcn.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "dynloader.h"
 
 static char error_message[BUFSIZ];
diff --git a/src/backend/port/dynloader/nextstep.c b/src/backend/port/dynloader/nextstep.c
index a96b394cda6..09b317daf97 100644
--- a/src/backend/port/dynloader/nextstep.c
+++ b/src/backend/port/dynloader/nextstep.c
@@ -3,8 +3,6 @@
 #include "mach-o/rld.h"
 #include "streams/streams.h"
 
-#include <stdlib.h>
-
 static char *lastError = NULL;
 
 static NXStream *
diff --git a/src/backend/port/dynloader/openbsd.c b/src/backend/port/dynloader/openbsd.c
index 2202b6847b4..3c950baddc0 100644
--- a/src/backend/port/dynloader/openbsd.c
+++ b/src/backend/port/dynloader/openbsd.c
@@ -42,9 +42,6 @@ static char sccsid[] = "@(#)dl.c	5.4 (Berkeley) 2/23/91";
 #include <link.h>
 #include <dlfcn.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "dynloader.h"
 
 static char error_message[BUFSIZ];
diff --git a/src/backend/port/dynloader/qnx4.c b/src/backend/port/dynloader/qnx4.c
index 6e6ca0437a7..7df4554e147 100644
--- a/src/backend/port/dynloader/qnx4.c
+++ b/src/backend/port/dynloader/qnx4.c
@@ -7,19 +7,20 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/Attic/qnx4.c,v 1.3 2001/02/10 02:31:26 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/Attic/qnx4.c,v 1.4 2002/11/08 20:23:56 momjian Exp $
  *
  *	NOTES
  *
  *-------------------------------------------------------------------------
  */
 /* System includes */
+
+#include "postgres.h"
+
 /*
-#include <stdio.h>
 #include <a.out.h>
 #include <dl.h>
 */
-#include "postgres.h"
 
 #include "utils/dynamic_loader.h"
 #include "dynloader.h"
diff --git a/src/backend/port/dynloader/ultrix4.c b/src/backend/port/dynloader/ultrix4.c
index ca637477a8b..770f3306a02 100644
--- a/src/backend/port/dynloader/ultrix4.c
+++ b/src/backend/port/dynloader/ultrix4.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * dynloader.c
+ * ultrix4.c
  *	  This dynamic loader uses Andrew Yu's libdl-1.0 package for Ultrix 4.x.
  *
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.15 2002/06/20 20:29:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.16 2002/11/08 20:23:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/port/qnx4/sem.c b/src/backend/port/qnx4/sem.c
index b3b782be8ce..da9aa551032 100644
--- a/src/backend/port/qnx4/sem.c
+++ b/src/backend/port/qnx4/sem.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.c,v 1.10 2002/09/02 02:47:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.c,v 1.11 2002/11/08 20:23:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,6 @@
 
 #include <errno.h>
 #include <semaphore.h>
-#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/mman.h>
diff --git a/src/backend/port/qnx4/shm.c b/src/backend/port/qnx4/shm.c
index cf42be4d85e..f3095f59563 100644
--- a/src/backend/port/qnx4/shm.c
+++ b/src/backend/port/qnx4/shm.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/shm.c,v 1.7 2001/10/25 05:49:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/shm.c,v 1.8 2002/11/08 20:23:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,8 +16,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 #include <sys/mman.h>
 #include <sys/shm.h>
diff --git a/src/backend/port/qnx4/tstrint.c b/src/backend/port/qnx4/tstrint.c
index 5586edb6787..895817fb6f3 100644
--- a/src/backend/port/qnx4/tstrint.c
+++ b/src/backend/port/qnx4/tstrint.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstrint.c,v 1.3 2001/08/24 14:07:49 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstrint.c,v 1.4 2002/11/08 20:23:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,8 +15,6 @@
 #include "c.h"
 
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 
 int
diff --git a/src/backend/port/qnx4/tstsem.c b/src/backend/port/qnx4/tstsem.c
index ebc6abe7d08..3834174a142 100644
--- a/src/backend/port/qnx4/tstsem.c
+++ b/src/backend/port/qnx4/tstsem.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstsem.c,v 1.8 2002/09/04 20:31:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstsem.c,v 1.9 2002/11/08 20:23:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,8 +15,6 @@
 #include "postgres.h"
 
 #include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include "storage/ipc.h"
 #include <sys/mman.h>
diff --git a/src/backend/port/qnx4/tstshm.c b/src/backend/port/qnx4/tstshm.c
index 0fd8226faad..73ac5ce3016 100644
--- a/src/backend/port/qnx4/tstshm.c
+++ b/src/backend/port/qnx4/tstshm.c
@@ -7,15 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstshm.c,v 1.3 2001/08/24 14:07:49 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstshm.c,v 1.4 2002/11/08 20:23:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <sys/shm.h>