diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-05-29 05:45:56 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-05-29 05:45:56 +0000 |
| commit | 091126fa28b4dbfd9df2fc4c22deade58f7e24dc (patch) | |
| tree | 5a4c362f26fa5b00688831ffdf1dfff8b0f60f1f /contrib/string | |
| parent | 18952f67446da73f938d213b5225b99e95657837 (diff) | |
| download | postgresql-091126fa28b4dbfd9df2fc4c22deade58f7e24dc.tar.gz | |
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/string')
| -rw-r--r-- | contrib/string/Makefile | 9 | ||||
| -rw-r--r-- | contrib/string/string_io.c | 1 |
2 files changed, 3 insertions, 7 deletions
diff --git a/contrib/string/Makefile b/contrib/string/Makefile index dd8f0e6f2a..d372aa0845 100644 --- a/contrib/string/Makefile +++ b/contrib/string/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 = string_io @@ -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/string/string_io.c b/contrib/string/string_io.c index cb8323d9c9..c329fec1e9 100644 --- a/contrib/string/string_io.c +++ b/contrib/string/string_io.c @@ -22,6 +22,7 @@ /* define this if you want to see iso-8859 characters */ #define ISO8859 +#undef MIN #define MIN(x, y) ((x) < (y) ? (x) : (y)) #define VALUE(char) ((char) - '0') #define DIGIT(val) ((val) + '0') |