Remove un-needed #include's from *.c files.

bmomjian · bmomjian · commit fb38a5d8cfd0 · 1999-07-15T19:21:43.000Z
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.44 1999/07/15 15:20:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.45 1999/07/15 19:21:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,6 @@
 #include "storage/fd.h"
 #include "fmgr.h"
 #include "utils/array.h"
-
 #include "libpq/libpq-fs.h"
 #include "libpq/be-fsstubs.h"
 
diff --git a/src/backend/utils/adt/arrayutils.c b/src/backend/utils/adt/arrayutils.c
@@ -7,15 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.8 1999/07/15 15:20:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.9 1999/07/15 19:21:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #define WEAK_C_OPTIMIZER
 
 #include "postgres.h"
-
+#include "utils/array.h"
 int
 GetOffset(int n, int *dim, int *lb, int *indx)
 {
diff --git a/src/tools/pginclude/pginclude b/src/tools/pginclude/pginclude
@@ -5,10 +5,11 @@ do
 	sed 's/->[a-zA-Z0-9_\.]*//g' "$FILE" >/tmp/$$a
 	echo "#include \"postgres.h\"" >/tmp/$$.c
 	echo "#include \"/tmp/$$a\"" >>/tmp/$$.c
+	echo "void include_test(void);" >>/tmp/$$.c
 	echo "void include_test() {" >>/tmp/$$.c
 	pgdefine "$FILE" >>/tmp/$$.c
 	echo "}" >>/tmp/$$.c
-	cc -Werror -Wall -I/pg/include -I/pg/backend -c /tmp/$$.c -o /tmp/$$.o >/tmp/$$ 2>&1
+	cc -fsyntax-only -Werror -Wall -Wmissing-prototypes -Wmissing-declarations -I/pg/include -I/pg/backend -c /tmp/$$.c -o /tmp/$$.o >/tmp/$$ 2>&1
 	if [ "$?" -ne 0 ]
 	then	echo "$FILE"
 		if [ "$1" = "-v" ]
diff --git a/src/tools/pginclude/pgnoinclude b/src/tools/pginclude/pgnoinclude
@@ -1,6 +1,6 @@
 :
 trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
-find . \( -name CVS -a -prune \) -o -type f -print | grep -v postgres.h |
+find . \( -name CVS -a -prune \) -o -type f -print | grep -v '\./postgres.h' |
 while read FILE
 do
 	if [ "`echo $FILE | sed -n 's/^.*\.\([^\.]*\)$/\1/p'`" = "h" ]
@@ -18,24 +18,26 @@ do
 	while read INCLUDE
 	do
 		[ -s /usr/include/$INCLUDE ] && continue
+		[ "$INCLUDE" = postgres.h ] && continue
 		cat /tmp/$$a |
 		grep -v '^#include[ 	]*[<"]'"$INCLUDE"'[>"]' >/tmp/$$b
 		if [ "$IS_INCLUDE" = "Y" ]
 		then	echo "#include \"postgres.h\"" >/tmp/$$.c
 		else	>/tmp/$$.c
 		fi
 		echo "#include \"/tmp/$$b\"" >>/tmp/$$.c
+		echo "void include_test(void);" >>/tmp/$$.c
 		echo "void include_test() {" >>/tmp/$$.c
 		if [ "$IS_INCLUDE" = "Y" ]
 		then	pgdefine "$FILE" >>/tmp/$$.c
 		fi
 		echo "}" >>/tmp/$$.c
-		cc -Werror -Wall -I/pg/include -I/pg/backend -c /tmp/$$.c -o /tmp/$$.o >/tmp/$$ 2>&1
+		cc -fsyntax-only -Werror -Wall -Wmissing-prototypes -Wmissing-declarations -I/pg/include -I/pg/backend -c /tmp/$$.c -o /tmp/$$.o >/tmp/$$ 2>&1
 		if [ "$?" -eq 0 ]
 		then	echo "$FILE $INCLUDE"
 			if [ "$IS_INCLUDE" = "N" ]
-			then	grep -v '#include[ 	]*[<"]$FILE[>"]' >/tmp/$$a
-				mv /tmp/$$a "$FILE"
+			then	grep -v '#include[ 	]*[<"]$INCLUDE[>"]' $FILE >/tmp/$$b
+				mv /tmp/$$b "$FILE"
 			fi
 			if [ "$1" = "-v" ]
 			then	cat /tmp/$$

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.44 1999/07/15 15:20:07 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.45 1999/07/15 19:21:41 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -27,7 +27,6 @@`
`27`	`27`	`#include "storage/fd.h"`
`28`	`28`	`#include "fmgr.h"`
`29`	`29`	`#include "utils/array.h"`
`30`		`-`
`31`	`30`	`#include "libpq/libpq-fs.h"`
`32`	`31`	`#include "libpq/be-fsstubs.h"`
`33`	`32`
Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,15 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.8 1999/07/15 15:20:10 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.9 1999/07/15 19:21:42 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`	`14`
`15`	`15`	`#define WEAK_C_OPTIMIZER`
`16`	`16`
`17`	`17`	`#include "postgres.h"`
`18`		`-`
	`18`	`+#include "utils/array.h"`
`19`	`19`	`int`
`20`	`20`	`GetOffset(int n, int dim, int lb, int *indx)`
`21`	`21`	`{`