aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/utils/init/postinit.c3
-rwxr-xr-xsrc/tools/pginclude/pgnoinclude6
2 files changed, 5 insertions, 4 deletions
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 111c49a6cec..e22194c51be 100644
--- 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 73f4578e716..0b75eb58884 100755
--- 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" ]