diff options
Diffstat (limited to 'src/tools/pginclude/pgnoinclude')
| -rwxr-xr-x | src/tools/pginclude/pgnoinclude | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/tools/pginclude/pgnoinclude b/src/tools/pginclude/pgnoinclude index c7825a0c6ff..37ef46c85af 100755 --- 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,6 +18,7 @@ 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" ] @@ -25,17 +26,18 @@ do 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/$$ |