database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-22 12:22:45 +03:00
Code Activity

From: Michael Meskes <meskes@topsystem.de>

Browse Source 
No more shift/reduce conflicts. Also all other bugs I know about are fixed.
This commit is contained in:
Marc G. Fournier
1998-02-27 12:59:33 +00:00
parent 1a6de0760d
commit 96ac738269
13 changed files with 163 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/interfaces/ecpg/lib/Makefile.in
View File

@@ -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

8
src/interfaces/ecpg/lib/ecpglib.c
View File

@@ -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)
{