diff options
| author | Tom Lane | 2000-05-29 05:45:56 +0000 |
|---|---|---|
| committer | Tom Lane | 2000-05-29 05:45:56 +0000 |
| commit | 091126fa28b4dbfd9df2fc4c22deade58f7e24dc (patch) | |
| tree | 5a4c362f26fa5b00688831ffdf1dfff8b0f60f1f /contrib/miscutil | |
| parent | 18952f67446da73f938d213b5225b99e95657837 (diff) | |
Generated header files parse.h and fmgroids.h are now copied into
the src/include tree, so that -I backend is no longer necessary anywhere.
Also, clean up some bit rot in contrib tree.
Diffstat (limited to 'contrib/miscutil')
| -rw-r--r-- | contrib/miscutil/Makefile | 9 | ||||
| -rw-r--r-- | contrib/miscutil/misc_utils.c | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/contrib/miscutil/Makefile b/contrib/miscutil/Makefile index fd0065b86ef..742db0334f5 100644 --- a/contrib/miscutil/Makefile +++ b/contrib/miscutil/Makefile @@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src include $(SRCDIR)/Makefile.global -INCLUDE_OPT = -I./ \ - -I$(SRCDIR)/ \ - -I$(SRCDIR)/include \ - -I$(SRCDIR)/port/$(PORTNAME) - -CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL) +CFLAGS += -I. $(CFLAGS_SL) MODNAME = misc_utils @@ -61,7 +56,7 @@ $(SQLDIR): $(CC) $(CFLAGS) -shared -o $@ $< depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f *~ $(MODULE) $(MODNAME).sql diff --git a/contrib/miscutil/misc_utils.c b/contrib/miscutil/misc_utils.c index 302118689dc..f5a98683280 100644 --- a/contrib/miscutil/misc_utils.c +++ b/contrib/miscutil/misc_utils.c @@ -15,6 +15,7 @@ #include <errno.h> #include "postgres.h" + #include "access/heapam.h" #include "access/htup.h" #include "access/relscan.h" @@ -22,14 +23,16 @@ #include "access/tupdesc.h" #include "catalog/catname.h" #include "catalog/pg_listener.h" +#include "fmgr.h" #include "storage/lmgr.h" -#include "utils/fmgr.h" +#include "utils/fmgroids.h" #include "utils/palloc.h" #include "utils/rel.h" #include "utils/tqual.h" #include "misc_utils.h" +#undef MIN #define MIN(x,y) ((x)<=(y) ? (x) : (y)) extern int ExecutorLimit(int limit); |