database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-02 11:44:50 +03:00
Code

Fix bug: libpq clients (which include libpq-fe.h) won't compile.

Browse Source
This commit is contained in:
Bryan Henderson 1996-12-10 07:05:12 +00:00
parent 2697c27923
commit 7f36a2a718
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/interfaces/libpq/Makefile
View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.21 1996/11/26 07:38:46 bryanh Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.22 1996/12/10 07:05:09 bryanh Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -40,7 +40,7 @@ shlib := libpq.so.1
endif endif
endif endif
all: libpq.a $(shlib) postgres.h c.h all: libpq.a $(shlib) c.h
libpq.a: $(OBJS) libpq.a: $(OBJS)
ifdef MK_NO_LORDER ifdef MK_NO_LORDER
@ -64,16 +64,6 @@ fe-lobj.o: ../backend/fmgr.h
libpq.so.1: $(OBJS) libpq.so.1: $(OBJS)
$(CC) $(LDFLAGS) -shared $(OBJS) -o libpq.so.1 $(CC) $(LDFLAGS) -shared $(OBJS) -o libpq.so.1
postgres.h: ../include/postgres.h
# Note: ../backend/include/postgres.h needs to be named something different
# to avoid confusion with this thing we're building now.
#
# hardwire NAMEDATALEN and OIDNAMELEN into the postgres.h for this installation
rm -f postgres.h
echo "#define NAMEDATALEN $(NAMEDATALEN)" >> postgres.h
echo "#define OIDNAMELEN $(OIDNAMELEN)" >> postgres.h
cat ../include/postgres.h >> postgres.h
c.h: ../include/c.h c.h: ../include/c.h
rm -f c.h rm -f c.h
echo "#undef PORTNAME" > c.h echo "#undef PORTNAME" > c.h
@ -85,12 +75,20 @@ c.h: ../include/c.h
install: install-headers install-libpq $(install-shlib-dep) install: install-headers install-libpq $(install-shlib-dep)
install-headers: beforeinstall-headers postgres.h c.h \ # Many of the headers we install below have nothing to do with libpq,
# so should be installed by someone else.
#
install-headers: beforeinstall-headers c.h \
../include/postgres.h ../include/postgres_ext.h \
../include/config.h ../include/libpq/pqcomm.h \ ../include/config.h ../include/libpq/pqcomm.h \
../include/libpq/libpq-fs.h ../include/lib/dllist.h \ ../include/libpq/libpq-fs.h ../include/lib/dllist.h \
../include/utils/geo-decls.h libpq-fe.h ../include/utils/geo-decls.h libpq-fe.h
$(INSTALL) $(INSTLOPTS) ../include/config.h \ $(INSTALL) $(INSTLOPTS) ../include/config.h \
$(HEADERDIR)/config.h $(HEADERDIR)/config.h
$(INSTALL) $(INSTLOPTS) ../include/postgres.h \
$(HEADERDIR)/postgres.h
$(INSTALL) $(INSTLOPTS) ../include/postgres_ext.h \
$(HEADERDIR)/postgres_ext.h
$(INSTALL) $(INSTLOPTS) ../include/libpq/pqcomm.h \ $(INSTALL) $(INSTLOPTS) ../include/libpq/pqcomm.h \
$(HEADERDIR)/libpq/pqcomm.h $(HEADERDIR)/libpq/pqcomm.h
$(INSTALL) $(INSTLOPTS) ../include/libpq/libpq-fs.h \ $(INSTALL) $(INSTLOPTS) ../include/libpq/libpq-fs.h \
@ -111,7 +109,6 @@ ifeq ($(PORTNAME), hpux)
$(HEADERDIR)/port/hpux/fixade.h $(HEADERDIR)/port/hpux/fixade.h
endif endif
$(INSTALL) $(INSTLOPTS) c.h $(HEADERDIR)/c.h $(INSTALL) $(INSTLOPTS) c.h $(HEADERDIR)/c.h
$(INSTALL) $(INSTLOPTS) postgres.h $(HEADERDIR)/postgres.h
beforeinstall-headers: beforeinstall-headers:
@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi @if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
@ -146,7 +143,7 @@ depend dep:
.PHONY: clean .PHONY: clean
clean: clean:
rm -f libpq.a libpq.so.1 $(OBJS) c.h postgres.h rm -f libpq.a libpq.so.1 $(OBJS) c.h
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend

8
src/interfaces/libpq/libpq-fe.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: libpq-fe.h,v 1.14 1996/12/04 03:06:33 bryanh Exp $ * $Id: libpq-fe.h,v 1.15 1996/12/10 07:05:12 bryanh Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -23,7 +23,7 @@ extern "C" {
* include stuff common to fe and be * include stuff common to fe and be
* ---------------- * ----------------
*/ */
/* #include "libpq/libpq.h" */ #include "postgres_ext.h"
#include "libpq/pqcomm.h" #include "libpq/pqcomm.h"
#include "lib/dllist.h" #include "lib/dllist.h"
@ -76,7 +76,7 @@ typedef struct {
typedef struct pgresAttDesc { typedef struct pgresAttDesc {
char* name; /* type name */ char* name; /* type name */
Oid adtid; /* type id */ Oid adtid; /* type id */
int2 adtsize; /* type size */ short adtsize; /* type size */
} PGresAttDesc; } PGresAttDesc;
/* use char* for Attribute values, /* use char* for Attribute values,
@ -214,7 +214,7 @@ extern int PQnfields(PGresult *res);
extern char* PQfname(PGresult *res, int field_num); extern char* PQfname(PGresult *res, int field_num);
extern int PQfnumber(PGresult *res, const char* field_name); extern int PQfnumber(PGresult *res, const char* field_name);
extern Oid PQftype(PGresult *res, int field_num); extern Oid PQftype(PGresult *res, int field_num);
extern int2 PQfsize(PGresult *res, int field_num); extern short PQfsize(PGresult *res, int field_num);
extern char* PQcmdStatus(PGresult *res); extern char* PQcmdStatus(PGresult *res);
extern const char* PQoidStatus(PGresult *res); extern const char* PQoidStatus(PGresult *res);
extern char* PQgetvalue(PGresult *res, int tup_num, int field_num); extern char* PQgetvalue(PGresult *res, int tup_num, int field_num);