More cleanup

diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 111c49a6cecdf916de50439c3015ecb248ce8bb3..e22194c51be80c555f66b124cf7cac67516d16ad 100644 (file)
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.45 1999/07/16 05:23:26 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.46 1999/07/16 17:46:32 momjian Exp $
  *
  * NOTES
  *     InitPostgres() is the function called from PostgresMain
@@ -41,7 +41,6 @@
 #include "libpq/libpq.h"
 #include "miscadmin.h"
 #include "storage/backendid.h"
-#include "storage/bufpage.h"
 #include "storage/proc.h"
 #include "storage/sinval.h"
 #include "storage/smgr.h"

diff --git a/src/tools/pginclude/pgnoinclude b/src/tools/pginclude/pgnoinclude
index 73f4578e716b7983547e163b1d2efac32114c80b..0b75eb58884d683c1bb5ae8fb3a38972f32bda81 100755 (executable)
--- a/src/tools/pginclude/pgnoinclude
+++ b/src/tools/pginclude/pgnoinclude
@@ -20,8 +20,10 @@ do
        [ -s /usr/include/$INCLUDE ] && continue
        [ "$INCLUDE" = postgres.h ] && continue
        # preserve configure-specific includes
-       grep -B1 -A1 -q '^#include[     ][  ]*[<"]'"$INCLUDE"'[>"]' |
-            egrep -q '^#if|^#else|^#endif' && continue     
+       grep -B1 '^#include[    ][  ]*[<"]'"$INCLUDE"'[>"]' "$FILE" |
+            egrep -q '^#if|^#else' && continue     
+       grep -A1 '^#include[    ][  ]*[<"]'"$INCLUDE"'[>"]' "$FILE" |
+            egrep -q '^#else|^#endif' && continue      
        cat /tmp/$$a |
        grep -v '^#include[     ]*[<"]'"$INCLUDE"'[>"]' >/tmp/$$b
        if [ "$IS_INCLUDE" = "Y" ]