1
0
mirror of https://github.com/postgres/postgres.git synced 2025-05-01 01:04:50 +03:00

Patch for Irix from Mark Dalphin.

This commit is contained in:
Bruce Momjian 2000-03-02 02:01:01 +00:00
parent c75adac757
commit bd2d0983d4
8 changed files with 12 additions and 10 deletions

View File

@ -12,7 +12,8 @@ LIBPQDIR= /usr/local/pgsql/lib
# inevitably get the warning, "abstract declarator used as declaration" # inevitably get the warning, "abstract declarator used as declaration"
# because of our inclusion of c.h and we don't know how to stop that. # because of our inclusion of c.h and we don't know how to stop that.
CXXFLAGS= $(CFLAGS) -Wno-error -Wno-unused -Wl,-Bdynamic #CXXFLAGS= $(CFLAGS) -Wno-error -Wno-unused -Wl,-Bdynamic
CXXFLAGS= $(CFLAGS)
INCLUDE_OPT= -I$(HEADERDIR) INCLUDE_OPT= -I$(HEADERDIR)

View File

@ -51,7 +51,7 @@ int main()
cout << endl << endl; cout << endl << endl;
// next, print out the instances // next, print out the instances
for (int i=0; i < data.Tuples(); i++) { for (i=0; i < data.Tuples(); i++) {
for (int j=0; j < nFields; j++) for (int j=0; j < nFields; j++)
cout << setiosflags(ios::right) << setw(15) << data.GetValue(i,j); cout << setiosflags(ios::right) << setw(15) << data.GetValue(i,j);
cout << endl; cout << endl;

View File

@ -45,7 +45,7 @@ int main()
cout << endl << endl; cout << endl << endl;
// next, print out the instances // next, print out the instances
for (int i=0; i < data.Tuples(); i++) { for ( i=0; i < data.Tuples(); i++) {
for (int j=0; j < nFields; j++) for (int j=0; j < nFields; j++)
cout << setiosflags(ios::right) << setw(15) << data.GetValue(i,j); cout << setiosflags(ios::right) << setw(15) << data.GetValue(i,j);
cout << endl; cout << endl;

View File

@ -48,7 +48,7 @@ int main()
cout << endl << endl; cout << endl << endl;
// next, print out the instances // next, print out the instances
for (int i=0; i < cData.Tuples(); i++) { for ( i=0; i < cData.Tuples(); i++) {
for (int j=0; j < nFields; j++) for (int j=0; j < nFields; j++)
cout << setiosflags(ios::right) << setw(15) << cData.GetValue(i,j); cout << setiosflags(ios::right) << setw(15) << cData.GetValue(i,j);
cout << endl; cout << endl;

View File

@ -31,8 +31,9 @@ extern "C" {
#include "libpq-fe.h" #include "libpq-fe.h"
} }
static char rcsid[] = "$Id: libpq++.h,v 1.5 2000/01/26 05:58:47 momjian Exp $"; static char rcsid[] = "$Id: libpq++.h,v 1.6 2000/03/02 02:00:58 momjian Exp $";
using namespace std;
// **************************************************************** // ****************************************************************
// //

View File

@ -13,7 +13,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: pgconnection.h,v 1.3 2000/01/26 05:58:47 momjian Exp $ * $Id: pgconnection.h,v 1.4 2000/03/02 02:00:58 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -28,6 +28,7 @@ extern "C" {
#include "libpq-fe.h" #include "libpq-fe.h"
} }
using namespace std;
// **************************************************************** // ****************************************************************
// //

View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.11 1999/06/30 23:57:29 tgl Exp $ # $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.12 2000/03/02 02:01:00 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@SET_MAKE@ @SET_MAKE@
@ -37,7 +37,7 @@ OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \
pgtypes.o psqlodbc.o qresult.o results.o socket.o parse.o statement.o \ pgtypes.o psqlodbc.o qresult.o results.o socket.o parse.o statement.o \
gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX) gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX)
SHLIB_LINK= $(LIBS) SHLIB_LINK= $(LD_FLAGS)
# Shared library stuff, also default 'all' target # Shared library stuff, also default 'all' target
include $(SRCDIR)/Makefile.shlib include $(SRCDIR)/Makefile.shlib

View File

@ -6,5 +6,4 @@ MK_NO_LORDER= true
%.so: %.o %.so: %.o
$(LD) -G -Bdynamic -shared -o $@ $< $(LD) -G -Bdynamic -shared -o $@ $<
CFLAGS+= -U_NO_XOPEN4 CFLAGS+= -U_NO_XOPEN4 -woff 1164,1171,1185,1195,1552 -Wl,-woff,15 -Wl,-woff,84