diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1998-02-27 12:59:33 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1998-02-27 12:59:33 +0000 |
| commit | 96ac738269d04c1402f1f459bfdfe0a11d979471 (patch) | |
| tree | 6d90d649f24075c1bd2a4cd08c6bffba02ecf71d /src/interfaces/ecpg/lib | |
| parent | 1a6de0760d5e2593e1b12a665923ca83134c109e (diff) | |
| download | postgresql-96ac738269d04c1402f1f459bfdfe0a11d979471.tar.gz postgresql-96ac738269d04c1402f1f459bfdfe0a11d979471.zip | |
From: Michael Meskes <meskes@topsystem.de>
No more shift/reduce conflicts. Also all other bugs I know about are fixed.
Diffstat (limited to 'src/interfaces/ecpg/lib')
| -rw-r--r-- | src/interfaces/ecpg/lib/Makefile.in | 18 | ||||
| -rw-r--r-- | src/interfaces/ecpg/lib/ecpglib.c | 8 |
2 files changed, 16 insertions, 10 deletions
diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in index 9917d169c2b..34faf548c10 100644 --- a/src/interfaces/ecpg/lib/Makefile.in +++ b/src/interfaces/ecpg/lib/Makefile.in @@ -8,6 +8,10 @@ SO_MINOR_VERSION=0 PORTNAME=@PORTNAME@ +ifdef KRBVERS +CFLAGS+= $(KRBFLAGS) +endif + # Shared library stuff shlib := install-shlib-dep := @@ -20,10 +24,12 @@ ifeq ($(PORTNAME), linux) endif endif ifeq ($(PORTNAME), bsd) - install-shlib-dep := install-shlib - shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) - LDFLAGS_SL = -x -Bshareable -Bforcearchive - CFLAGS += $(CFLAGS_SL) + ifdef BSD_SHLIB + install-shlib-dep := install-shlib + shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) + LDFLAGS_SL = -x -Bshareable -Bforcearchive + CFLAGS += $(CFLAGS_SL) + endif endif #ifeq ($(PORTNAME), i386_solaris) # install-shlib-dep := install-shlib @@ -61,6 +67,6 @@ uninstall:: libecpg.a : libecpg.a(ecpglib.o) libecpg.a(typename.o) ecpglib.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h - $(CC) -I../include $(PQ_INCLUDE) -c ecpglib.c + $(CC) $(CFLAGS) -I../include $(PQ_INCLUDE) -c ecpglib.c typename.o : typename.c ../include/ecpgtype.h - $(CC) -I../include $(PQ_INCLUDE) -c typename.c + $(CC) $(CFLAGS) -I../include $(PQ_INCLUDE) -c typename.c diff --git a/src/interfaces/ecpg/lib/ecpglib.c b/src/interfaces/ecpg/lib/ecpglib.c index f5778f9ac3c..301b43d6c7b 100644 --- a/src/interfaces/ecpg/lib/ecpglib.c +++ b/src/interfaces/ecpg/lib/ecpglib.c @@ -18,11 +18,11 @@ #include <stdarg.h> #include <string.h> +#include <libpq-fe.h> +#include <libpq/pqcomm.h> #include <ecpgtype.h> #include <ecpglib.h> #include <sqlca.h> -#include <libpq-fe.h> -#include <libpq/pqcomm.h> static PGconn *simple_connection = NULL; static int simple_debug = 0; @@ -639,14 +639,14 @@ ECPGconnect(const char *dbname) bool -ECPGstatus() +ECPGstatus(void) { return PQstatus(simple_connection) != CONNECTION_BAD; } bool -ECPGfinish() +ECPGfinish(void) { if (simple_connection != NULL) { |