NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitfb38a5d

committed

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

1 parent353eb3d commitfb38a5dCopy full SHA for fb38a5d

File tree

4 files changed

+11

-9

lines changed

src
- backend/utils/adt
  - arrayfuncs.c
  - arrayutils.c
- tools/pginclude
  - pginclude
  - pgnoinclude

4 files changed

+11

-9

lines changed

`‎src/backend/utils/adt/arrayfuncs.c`

Lines changed: 1 addition & 2 deletions

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/1515:20:07 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.45 1999/07/1519: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`

`‎src/backend/utils/adt/arrayutils.c`

Lines changed: 2 additions & 2 deletions

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/1515:20:10 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.9 1999/07/1519:21:42 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`	`14`
`15`	`15`	`#defineWEAK_C_OPTIMIZER`
`16`	`16`
`17`	`17`	`#include"postgres.h"`
`18`		`-`
	`18`	`+#include"utils/array.h"`
`19`	`19`	`int`
`20`	`20`	`GetOffset(intn,intdim,intlb,int*indx)`
`21`	`21`	`{`

`‎src/tools/pginclude/pginclude`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,11 @@ do`
`5`	`5`	`sed 's/->[a-zA-Z0-9_\.]*//g' "$FILE" >/tmp/$$a`
`6`	`6`	`echo "#include \"postgres.h\"" >/tmp/$$.c`
`7`	`7`	`echo "#include \"/tmp/$$a\"" >>/tmp/$$.c`
	`8`	`+echo "void include_test(void);" >>/tmp/$$.c`
`8`	`9`	`echo "void include_test() {" >>/tmp/$$.c`
`9`	`10`	`pgdefine "$FILE" >>/tmp/$$.c`
`10`	`11`	`echo "}" >>/tmp/$$.c`
`11`		`-cc -Werror -Wall -I/pg/include -I/pg/backend -c /tmp/$$.c -o /tmp/$$.o >/tmp/$$ 2>&1`
	`12`	`+cc -fsyntax-only -Werror -Wall -Wmissing-prototypes -Wmissing-declarations -I/pg/include -I/pg/backend -c /tmp/$$.c -o /tmp/$$.o >/tmp/$$ 2>&1`
`12`	`13`	`if [ "$?" -ne 0 ]`
`13`	`14`	`thenecho "$FILE"`
`14`	`15`	`if [ "$1" = "-v" ]`

`‎src/tools/pginclude/pgnoinclude`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`:`
`2`	`2`	`trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15`
`3`		`-find . $ -name CVS -a -prune $ -o -type f -print \| grep -v postgres.h \|`
	`3`	`+find . $ -name CVS -a -prune $ -o -type f -print \| grep -v'\./postgres.h' \|`
`4`	`4`	`while read FILE`
`5`	`5`	`do`
`6`	`6`	if [ "`echo $FILE \| sed -n 's/^.\.$[^\.]$$/\1/p'`" = "h" ]
`@@ -18,24 +18,26 @@ do`
`18`	`18`	`while read INCLUDE`
`19`	`19`	`do`
`20`	`20`	`[ -s /usr/include/$INCLUDE ] && continue`
	`21`	`+[ "$INCLUDE" = postgres.h ] && continue`
`21`	`22`	`cat /tmp/$$a \|`
`22`	`23`	`grep -v '^#include[ ]*[<"]'"$INCLUDE"'[>"]' >/tmp/$$b`
`23`	`24`	`if [ "$IS_INCLUDE" = "Y" ]`
`24`	`25`	`thenecho "#include \"postgres.h\"" >/tmp/$$.c`
`25`	`26`	`else>/tmp/$$.c`
`26`	`27`	`fi`
`27`	`28`	`echo "#include \"/tmp/$$b\"" >>/tmp/$$.c`
	`29`	`+echo "void include_test(void);" >>/tmp/$$.c`
`28`	`30`	`echo "void include_test() {" >>/tmp/$$.c`
`29`	`31`	`if [ "$IS_INCLUDE" = "Y" ]`
`30`	`32`	`thenpgdefine "$FILE" >>/tmp/$$.c`
`31`	`33`	`fi`
`32`	`34`	`echo "}" >>/tmp/$$.c`
`33`		`-cc -Werror -Wall -I/pg/include -I/pg/backend -c /tmp/$$.c -o /tmp/$$.o >/tmp/$$ 2>&1`
	`35`	`+cc -fsyntax-only -Werror -Wall -Wmissing-prototypes -Wmissing-declarations -I/pg/include -I/pg/backend -c /tmp/$$.c -o /tmp/$$.o >/tmp/$$ 2>&1`
`34`	`36`	`if [ "$?" -eq 0 ]`
`35`	`37`	`thenecho "$FILE $INCLUDE"`
`36`	`38`	`if [ "$IS_INCLUDE" = "N" ]`
`37`		`-thengrep -v '#include[ ]*[<"]$FILE[>"]' >/tmp/$$a`
`38`		`-mv /tmp/$$a "$FILE"`
	`39`	`+thengrep -v '#include[ ]*[<"]$INCLUDE[>"]'$FILE>/tmp/$$b`
	`40`	`+mv /tmp/$$b "$FILE"`
`39`	`41`	`fi`
`40`	`42`	`if [ "$1" = "-v" ]`
`41`	`43`	`thencat /tmp/$$`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitfb38a5d

File tree

4 files changed

4 files changed

`‎src/backend/utils/adt/arrayfuncs.c`

`‎src/backend/utils/adt/arrayutils.c`

`‎src/tools/pginclude/pginclude`

`‎src/tools/pginclude/pgnoinclude`

0 commit comments

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`:`
`2`	`2`	`trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15`
`3`		`-find . \( -name CVS -a -prune \) -o -type f -print \| grep -v postgres.h \|`
	`3`	`+find . \( -name CVS -a -prune \) -o -type f -print \| grep -v'\./postgres.h' \|`
`4`	`4`	`while read FILE`
`5`	`5`	`do`
`6`	`6`	if [ "`echo $FILE \| sed -n 's/^.\.\([^\.]\)$/\1/p'`" = "h" ]
`@@ -18,24 +18,26 @@ do`
`18`	`18`	`while read INCLUDE`
`19`	`19`	`do`
`20`	`20`	`[ -s /usr/include/$INCLUDE ] && continue`
	`21`	`+[ "$INCLUDE" = postgres.h ] && continue`
`21`	`22`	`cat /tmp/$$a \|`
`22`	`23`	`grep -v '^#include[ ]*[<"]'"$INCLUDE"'[>"]' >/tmp/$$b`
`23`	`24`	`if [ "$IS_INCLUDE" = "Y" ]`
`24`	`25`	`thenecho "#include \"postgres.h\"" >/tmp/$$.c`
`25`	`26`	`else>/tmp/$$.c`
`26`	`27`	`fi`
`27`	`28`	`echo "#include \"/tmp/$$b\"" >>/tmp/$$.c`
	`29`	`+echo "void include_test(void);" >>/tmp/$$.c`
`28`	`30`	`echo "void include_test() {" >>/tmp/$$.c`
`29`	`31`	`if [ "$IS_INCLUDE" = "Y" ]`
`30`	`32`	`thenpgdefine "$FILE" >>/tmp/$$.c`
`31`	`33`	`fi`
`32`	`34`	`echo "}" >>/tmp/$$.c`
`33`		`-cc -Werror -Wall -I/pg/include -I/pg/backend -c /tmp/$$.c -o /tmp/$$.o >/tmp/$$ 2>&1`
	`35`	`+cc -fsyntax-only -Werror -Wall -Wmissing-prototypes -Wmissing-declarations -I/pg/include -I/pg/backend -c /tmp/$$.c -o /tmp/$$.o >/tmp/$$ 2>&1`
`34`	`36`	`if [ "$?" -eq 0 ]`
`35`	`37`	`thenecho "$FILE $INCLUDE"`
`36`	`38`	`if [ "$IS_INCLUDE" = "N" ]`
`37`		`-thengrep -v '#include[ ]*[<"]$FILE[>"]' >/tmp/$$a`
`38`		`-mv /tmp/$$a "$FILE"`
	`39`	`+thengrep -v '#include[ ]*[<"]$INCLUDE[>"]'$FILE>/tmp/$$b`
	`40`	`+mv /tmp/$$b "$FILE"`
`39`	`41`	`fi`
`40`	`42`	`if [ "$1" = "-v" ]`
`41`	`43`	`thencat /tmp/$$`