diff options
author | Bruce Momjian | 2000-06-15 03:33:12 +0000 |
---|---|---|
committer | Bruce Momjian | 2000-06-15 03:33:12 +0000 |
commit | 892b2676f4cfaae79c4d7dc93fef26709eb4aff9 (patch) | |
tree | 8309ff0e43490e14d421a158f5bbdc1dedc7d137 | |
parent | 10730c2667ddddd67096d81ce3fab2132c33198e (diff) |
Clean up #include's.
50 files changed, 53 insertions, 47 deletions
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index 26954f33c8..c3a62ea001 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -18,6 +18,7 @@ #include "access/gistscan.h" #include "access/heapam.h" #include "catalog/index.h" +#include "catalog/pg_index.h" #include "executor/executor.h" #include "miscadmin.h" #include "utils/syscache.h" diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c index 600f1da6b9..d6b7c9fefb 100644 --- a/src/backend/access/nbtree/nbtcompare.c +++ b/src/backend/access/nbtree/nbtcompare.c @@ -32,6 +32,7 @@ #include "postgres.h" +#include "utils/nabstime.h" #include "utils/builtins.h" Datum diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c index 963863145d..7b17e45f98 100644 --- a/src/backend/access/rtree/rtget.c +++ b/src/backend/access/rtree/rtget.c @@ -16,9 +16,9 @@ #include "postgres.h" #include "access/iqual.h" +#include "access/relscan.h" #include "access/rtree.h" - - +#include "storage/off.h" static OffsetNumber findnext(IndexScanDesc s, Page p, OffsetNumber n, ScanDirection dir); diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 7a41d1a44c..da88e683a0 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -38,6 +38,7 @@ #include "catalog/indexing.h" #include "catalog/pg_attrdef.h" #include "catalog/pg_inherits.h" +#include "catalog/pg_index.h" #include "catalog/pg_ipl.h" #include "catalog/pg_proc.h" #include "catalog/pg_relcheck.h" @@ -54,6 +55,7 @@ #include "parser/parse_expr.h" #include "parser/parse_relation.h" #include "parser/parse_target.h" +#include "parser/parse_type.h" #include "rewrite/rewriteRemove.h" #include "storage/smgr.h" #include "utils/builtins.h" diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index eb033315dc..9f3131ec0a 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -29,6 +29,7 @@ #include "catalog/heap.h" #include "catalog/index.h" #include "catalog/indexing.h" +#include "catalog/pg_index.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" #include "commands/comment.h" diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c index fddf49b327..15f50201ed 100644 --- a/src/backend/catalog/indexing.c +++ b/src/backend/catalog/indexing.c @@ -22,6 +22,7 @@ #include "catalog/catname.h" #include "catalog/index.h" #include "catalog/indexing.h" +#include "catalog/pg_index.h" #include "miscadmin.h" #include "utils/fmgroids.h" #include "utils/syscache.h" diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 3ddd045ab0..2048a8afa4 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -26,6 +26,7 @@ #include "access/heapam.h" #include "catalog/heap.h" #include "catalog/index.h" +#include "catalog/pg_index.h" #include "catalog/pg_proc.h" #include "commands/cluster.h" #include "commands/rename.h" diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index b7d875e854..f4083006f7 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -21,6 +21,7 @@ #include "access/heapam.h" #include "catalog/catname.h" #include "catalog/index.h" +#include "catalog/pg_index.h" #include "catalog/pg_shadow.h" #include "catalog/pg_type.h" #include "commands/copy.h" diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 18f84c3c18..98fa199ff9 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -22,6 +22,7 @@ #include "catalog/index.h" #include "catalog/pg_amop.h" #include "catalog/pg_database.h" +#include "catalog/pg_index.h" #include "catalog/pg_opclass.h" #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index 96ddb263df..d1a640462a 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -48,6 +48,7 @@ #include "catalog/catname.h" #include "catalog/index.h" #include "catalog/catalog.h" +#include "catalog/pg_index.h" #include "executor/execdebug.h" #include "executor/executor.h" #include "miscadmin.h" diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index b723cdbca5..96a3254fae 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -47,6 +47,7 @@ #include "optimizer/clauses.h" #include "parser/parse_expr.h" #include "parser/parse_oper.h" +#include "parser/parse_type.h" #include "utils/syscache.h" #include "utils/tuplesort.h" diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index f221cb34b9..e5c5020089 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -18,6 +18,7 @@ #include "postgres.h" +#include "catalog/pg_index.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 56df62d61b..3cc61beae2 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -31,6 +31,7 @@ #include "optimizer/tlist.h" #include "optimizer/var.h" #include "parser/parse_expr.h" +#include "parser/parse_type.h" #include "utils/lsyscache.h" diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index b01e1ece2e..26930b7fc6 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -27,6 +27,7 @@ #include "catalog/catname.h" #include "catalog/pg_amop.h" #include "catalog/pg_inherits.h" +#include "catalog/pg_index.h" #include "optimizer/plancat.h" #include "parser/parsetree.h" #include "utils/builtins.h" diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c index 4fa88df321..2d8833c01f 100644 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@ -21,6 +21,7 @@ #include "parser/parse_coerce.h" #include "parser/parse_expr.h" #include "parser/parsetree.h" +#include "parser/parse_type.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 416e7aa561..798a2172bd 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -25,6 +25,7 @@ #include "parser/parse_oper.h" #include "parser/parse_relation.h" #include "parser/parse_target.h" +#include "parser/parse_type.h" #define ORDER_CLAUSE 0 #define GROUP_CLAUSE 1 diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index bd45ba0fb6..555f7c35f5 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -19,6 +19,7 @@ #include "parser/parse_coerce.h" #include "parser/parse_expr.h" #include "parser/parse_func.h" +#include "parser/parse_type.h" #include "utils/builtins.h" #include "utils/syscache.h" diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 1d7c329ebb..f0af5f0d59 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -28,6 +28,7 @@ #include "parser/parse_oper.h" #include "parser/parse_relation.h" #include "parser/parse_target.h" +#include "parser/parse_type.h" #include "utils/builtins.h" #include "utils/syscache.h" diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index 1973939263..7729342307 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -29,6 +29,7 @@ #include "parser/parse_expr.h" #include "parser/parse_func.h" #include "parser/parse_relation.h" +#include "parser/parse_type.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index 5fd1c8cf3b..c79d014d42 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -20,6 +20,7 @@ #include "parser/parse_func.h" #include "parser/parse_relation.h" #include "parser/parse_target.h" +#include "parser/parse_type.h" static List *ExpandAllTables(ParseState *pstate); diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index 2297b8e8f2..b63fb91684 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -26,6 +26,7 @@ #include "parser/parse_oper.h" #include "parser/parse_target.h" #include "parser/parsetree.h" +#include "parser/parse_type.h" #include "rewrite/locks.h" #include "rewrite/rewriteManip.h" #include "utils/acl.h" diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c index b37d812b96..871fc5ab95 100644 --- a/src/backend/storage/file/buffile.c +++ b/src/backend/storage/file/buffile.c @@ -36,6 +36,7 @@ #include "postgres.h" +#include "storage/fd.h" #include "storage/buffile.h" /* diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c index d33bab84c5..f12bac163e 100644 --- a/src/backend/utils/adt/cash.c +++ b/src/backend/utils/adt/cash.c @@ -14,6 +14,7 @@ #include <limits.h> #include <ctype.h> +#include <math.h> #include <locale.h> #include "postgres.h" diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index 49ebf45569..378f696543 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -13,16 +13,20 @@ *------------------------------------------------------------------------- */ #include <limits.h> +#include <time.h> #include "postgres.h" #ifdef HAVE_FLOAT_H #include <float.h> #endif #include "miscadmin.h" +#include "utils/date.h" +#include "utils/datetime.h" +#include "utils/nabstime.h" #include "utils/builtins.h" static int - date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn); + date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn); /***************************************************************************** diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index b12d367257..4dc2d82b83 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -67,8 +67,11 @@ #include "postgres.h" #include "utils/builtins.h" -#include "utils/pg_locale.h" +#include "utils/date.h" +#include "utils/datetime.h" #include "utils/formatting.h" +#include "utils/int8.h" +#include "utils/pg_locale.h" /* ---------- * Routines type diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 1b6c35ace8..192c7da474 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -19,6 +19,7 @@ #include <sys/types.h> #include "utils/builtins.h" +#include "utils/int8.h" #include "utils/numeric.h" /* ---------- diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index efb936ce23..d3610a223f 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -37,6 +37,7 @@ #include "parser/parse_func.h" #include "parser/parse_oper.h" #include "utils/builtins.h" +#include "utils/date.h" #include "utils/int8.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c index 59f4840cdc..15a297fc42 100644 --- a/src/backend/utils/adt/varbit.c +++ b/src/backend/utils/adt/varbit.c @@ -33,6 +33,7 @@ #endif #include "fmgr.h" #include "utils/builtins.h" +#include "utils/varbit.h" #include "access/htup.h" /* diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index 9e7420e72c..edf27fd3b0 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -16,6 +16,7 @@ #include "postgres.h" #include "catalog/pg_type.h" +#include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h index bbf1bf38f4..8fdf6c8d62 100644 --- a/src/include/access/ibit.h +++ b/src/include/access/ibit.h @@ -14,8 +14,6 @@ #ifndef IBIT_H #define IBIT_H -#include "catalog/pg_index.h" - typedef struct IndexAttributeBitMapData { bits8 bits[(INDEX_MAX_KEYS + 8 - 1) / 8]; diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index 55058d3727..9baac81944 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -14,7 +14,6 @@ #ifndef NBTREE_H #define NBTREE_H -#include "access/funcindex.h" #include "access/itup.h" #include "access/relscan.h" #include "access/sdir.h" diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h index 06dc207193..c06e71cdc5 100644 --- a/src/include/access/rtree.h +++ b/src/include/access/rtree.h @@ -14,10 +14,10 @@ #ifndef RTREE_H #define RTREE_H -#include "access/funcindex.h" #include "access/itup.h" -#include "access/relscan.h" #include "access/sdir.h" +#include "access/skey.h" +#include "utils/rel.h" /* see rtstrat.c for what all this is about */ #define RTNStrategies 8 diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h index d695caa2df..4d1f846fa9 100644 --- a/src/include/commands/sequence.h +++ b/src/include/commands/sequence.h @@ -9,7 +9,6 @@ #ifndef SEQUENCE_H #define SEQUENCE_H -#include "fmgr.h" #include "nodes/parsenodes.h" /* diff --git a/src/include/commands/user.h b/src/include/commands/user.h index 9097675ee1..a3e8c9c822 100644 --- a/src/include/commands/user.h +++ b/src/include/commands/user.h @@ -11,7 +11,6 @@ #define USER_H #include "nodes/parsenodes.h" -#include "access/htup.h" extern void CreateUser(CreateUserStmt *stmt); extern void AlterUser(AlterUserStmt *stmt); diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index 6f36bf26a5..1fe6dc0075 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.h @@ -15,7 +15,6 @@ #define NODEHASHJOIN_H #include "nodes/plannodes.h" -#include "storage/buffile.h" extern TupleTableSlot *ExecHashJoin(HashJoin *node); extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent); diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index 99015f0cbd..2b7e14a229 100644 --- a/src/include/libpq/hba.h +++ b/src/include/libpq/hba.h @@ -13,8 +13,6 @@ #include <netinet/in.h> -#include "libpq/pqcomm.h" - #define CONF_FILE "pg_hba.conf" /* Name of the config file */ @@ -42,7 +40,7 @@ typedef enum UserAuth typedef struct Port hbaPort; -int hba_getauthmethod(hbaPort *port); +int hba_getauthmethod(hbaPort *port); int authident(struct sockaddr_in * raddr, struct sockaddr_in * laddr, const char *postgres_username, const char *auth_arg); diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index acd7822fc7..35ca6fe91f 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -18,6 +18,7 @@ #include <sys/types.h> #include "libpq/hba.h" +#include "libpq/pqcomm.h" #ifdef USE_SSL #include <openssl/ssl.h> diff --git a/src/include/optimizer/internal.h b/src/include/optimizer/internal.h index f46bea18da..477388b794 100644 --- a/src/include/optimizer/internal.h +++ b/src/include/optimizer/internal.h @@ -14,8 +14,6 @@ #ifndef INTERNAL_H #define INTERNAL_H -#include "catalog/pg_index.h" - /* * ---------- SHARED MACROS * diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h index 9b34687cfe..2349f9c86d 100644 --- a/src/include/parser/parse_expr.h +++ b/src/include/parser/parse_expr.h @@ -15,7 +15,6 @@ #define PARSE_EXPR_H #include "parser/parse_node.h" -#include "parser/parse_type.h" #define EXPR_COLUMN_FIRST 1 #define EXPR_RELATION_FIRST 2 diff --git a/src/include/regex/regex2.h b/src/include/regex/regex2.h index 25d7853c42..d6cb23a5d3 100644 --- a/src/include/regex/regex2.h +++ b/src/include/regex/regex2.h @@ -39,6 +39,8 @@ #include "postgres.h" +#include "limits.h" + /* * First, the stuff that ends up in the outside-world include file */ diff --git a/src/include/regex/utils.h b/src/include/regex/utils.h index b2e2307e1d..461e7ad6b0 100644 --- a/src/include/regex/utils.h +++ b/src/include/regex/utils.h @@ -39,6 +39,8 @@ #include "postgres.h" +#include "limits.h" + /* utility definitions */ #define DUPMAX 100000000 /* xxx is this right? */ #define INFINITY (DUPMAX + 1) diff --git a/src/include/storage/buffile.h b/src/include/storage/buffile.h index 7e0ceb4c3d..dc26d095db 100644 --- a/src/include/storage/buffile.h +++ b/src/include/storage/buffile.h @@ -26,8 +26,6 @@ #ifndef BUFFILE_H #define BUFFILE_H -#include "storage/fd.h" - /* BufFile is an opaque type whose details are not known outside buffile.c. */ typedef struct BufFile BufFile; diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 721fe42a2d..8aa9722c48 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -15,11 +15,7 @@ #define BUFMGR_H -#include "storage/ipc.h" -#include "storage/block.h" -#include "storage/buf.h" #include "storage/buf_internals.h" -#include "utils/rel.h" /* * the maximum size of a disk block for any possible installation. diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h index b9308d7e30..3bee5f7bf6 100644 --- a/src/include/storage/sinvaladt.h +++ b/src/include/storage/sinvaladt.h @@ -14,7 +14,6 @@ #ifndef SINVALADT_H #define SINVALADT_H -#include "storage/ipc.h" #include "storage/itemptr.h" #include "storage/shmem.h" diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index ed3b87505c..c3657f0d23 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -21,7 +21,6 @@ #include <setjmp.h> #include "executor/execdesc.h" -#include "parser/parse_node.h" extern DLLIMPORT sigjmp_buf Warn_restart; extern bool Warn_restart_ready; diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 352b481547..6053cef0c5 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -14,20 +14,12 @@ #ifndef BUILTINS_H #define BUILTINS_H -#include "fmgr.h" #include "nodes/relation.h" /* for amcostestimate parameters */ #include "storage/itemptr.h" -#include "utils/array.h" #include "utils/inet.h" -#include "utils/int8.h" #include "utils/geo_decls.h" #include "utils/numeric.h" -#include "utils/datetime.h" -#include "utils/timestamp.h" -#include "utils/nabstime.h" -#include "utils/date.h" #include "utils/lztext.h" -#include "utils/varbit.h" /* * Defined in adt/ diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index 7624ab1950..d0512e35c7 100644 --- a/src/include/utils/catcache.h +++ b/src/include/utils/catcache.h @@ -17,7 +17,6 @@ /* #define CACHEDEBUG turns DEBUG elogs on */ #include "access/htup.h" -#include "fmgr.h" #include "lib/dllist.h" /* diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h index 90f088ea2d..a981fc398b 100644 --- a/src/include/utils/ps_status.h +++ b/src/include/utils/ps_status.h @@ -10,8 +10,6 @@ #ifndef PS_STATUS_H #define PS_STATUS_H -#include "libpq/libpq-be.h" - void init_ps_display(int argc, char *argv[], const char * username, const char * dbname, diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h index 1e7698b368..0b85bfc34b 100644 --- a/src/include/utils/tuplesort.h +++ b/src/include/utils/tuplesort.h @@ -22,9 +22,6 @@ #include "access/htup.h" #include "access/itup.h" -#include "access/skey.h" -#include "access/tupdesc.h" -#include "utils/rel.h" /* Tuplesortstate is an opaque type whose details are not known outside tuplesort.c. */ diff --git a/src/tools/pginclude/pgrminclude b/src/tools/pginclude/pgrminclude index e91997bc3f..60839c15dc 100755 --- a/src/tools/pginclude/pgrminclude +++ b/src/tools/pginclude/pgrminclude @@ -12,12 +12,15 @@ do then IS_INCLUDE="Y" else IS_INCLUDE="N" fi - + + # remove defines if [ "$IS_INCLUDE" = "Y" ] then cat "$FILE" | grep -v "^#if" | grep -v "^#else" | grep -v "^#endif" | sed 's/->[a-zA-Z0-9_\.]*//g' >/tmp/$$a else cat "$FILE" >/tmp/$$a fi + + # loop through all includes cat /tmp/$$a | grep "^#include" | sed 's/^#include[ ]*[<"]\([^>"]*\).*$/\1/g' | while read INCLUDE @@ -26,11 +29,14 @@ do [ "$INCLUDE" = postgres.h ] && continue [ "$INCLUDE" = config.h ] && continue [ "$INCLUDE" = c.h ] && continue + # preserve configure-specific includes + # these includes are surrounded by #ifdef's 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" ] @@ -50,12 +56,6 @@ do if [ "$IS_INCLUDE" = "N" ] then grep -v '^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]' "$FILE" >/tmp/$$b mv /tmp/$$b "$FILE" - # reload after #include removal - if [ "$IS_INCLUDE" = "Y" ] - then cat "$FILE" | grep -v "^#if" | grep -v "^#else" | - grep -v "^#endif" | sed 's/->[a-zA-Z0-9_\.]*//g' >/tmp/$$a - else cat "$FILE" >/tmp/$$a - fi fi if [ "$1" = "-v" ] then cat /tmp/$$ |