diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2003-05-22 17:20:44 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2003-05-22 17:20:44 +0000 |
| commit | 6fabec242d91e655091ce1428fb717f36b82929b (patch) | |
| tree | e7663302eb9429c2882b190d1095aa7d310287c5 /src/interfaces/ecpg | |
| parent | cef0652a3d88baeca25459902657c94c1e360682 (diff) | |
| download | postgresql-6fabec242d91e655091ce1428fb717f36b82929b.tar.gz | |
Fix compilation on Cygwin.
Diffstat (limited to 'src/interfaces/ecpg')
| -rw-r--r-- | src/interfaces/ecpg/Makefile | 4 | ||||
| -rw-r--r-- | src/interfaces/ecpg/compatlib/Makefile | 3 | ||||
| -rw-r--r-- | src/interfaces/ecpg/compatlib/informix.c | 2 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/Makefile | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile index 74286ce6ec..35fe094adf 100644 --- a/src/interfaces/ecpg/Makefile +++ b/src/interfaces/ecpg/Makefile @@ -4,15 +4,15 @@ include $(top_builddir)/src/Makefile.global all install installdirs uninstall dep depend distprep: $(MAKE) -C include $@ - $(MAKE) -C ecpglib $@ $(MAKE) -C pgtypeslib $@ + $(MAKE) -C ecpglib $@ $(MAKE) -C compatlib $@ $(MAKE) -C preproc $@ clean distclean maintainer-clean: -$(MAKE) -C include $@ - -$(MAKE) -C ecpglib $@ -$(MAKE) -C pgtypeslib $@ + -$(MAKE) -C ecpglib $@ -$(MAKE) -C compatlib $@ -$(MAKE) -C preproc $@ -$(MAKE) -C test clean diff --git a/src/interfaces/ecpg/compatlib/Makefile b/src/interfaces/ecpg/compatlib/Makefile index c7bc8ef84e..b87275c6f5 100644 --- a/src/interfaces/ecpg/compatlib/Makefile +++ b/src/interfaces/ecpg/compatlib/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.3 2003/04/16 05:23:55 tgl Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.4 2003/05/22 17:20:44 petere Exp $ # #------------------------------------------------------------------------- @@ -17,6 +17,7 @@ SO_MAJOR_VERSION= 1 SO_MINOR_VERSION= 0.0 override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(top_srcdir)/src/include/utils $(CPPFLAGS) +SHLIB_LINK = -L../pgtypeslib -lpgtypes OBJS= informix.o diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c index 27d2f9acd7..078cc1b295 100644 --- a/src/interfaces/ecpg/compatlib/informix.c +++ b/src/interfaces/ecpg/compatlib/informix.c @@ -55,7 +55,7 @@ deccopy(Numeric *src, Numeric *target) } static char * -strndup(char *str, int len) +strndup(const char *str, size_t len) { int real_len = strlen(str); int use_len = (real_len > len) ? len : real_len; diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile index 6b47cf695e..269f2d1461 100644 --- a/src/interfaces/ecpg/ecpglib/Makefile +++ b/src/interfaces/ecpg/ecpglib/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.2 2003/04/08 17:09:01 tgl Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.3 2003/05/22 17:20:44 petere Exp $ # #------------------------------------------------------------------------- @@ -21,7 +21,7 @@ override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdi OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \ connect.o misc.o -SHLIB_LINK= $(libpq) +SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) all: all-lib |