Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbd2d098

Browse files
committed
Patch for Irix from Mark Dalphin.
1 parentc75adac commitbd2d098

File tree

8 files changed

+12
-10
lines changed

8 files changed

+12
-10
lines changed

‎src/interfaces/libpq++/examples/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ LIBPQDIR= /usr/local/pgsql/lib
1212
# inevitably get the warning, "abstract declarator used as declaration"
1313
# because of our inclusion of c.h and we don't know how to stop that.
1414

15-
CXXFLAGS=$(CFLAGS) -Wno-error -Wno-unused -Wl,-Bdynamic
15+
#CXXFLAGS= $(CFLAGS) -Wno-error -Wno-unused -Wl,-Bdynamic
16+
CXXFLAGS=$(CFLAGS)
1617

1718
INCLUDE_OPT= -I$(HEADERDIR)
1819

‎src/interfaces/libpq++/examples/testlibpq1.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ int main()
5151
cout << endl << endl;
5252

5353
// next, print out the instances
54-
for (inti=0; i < data.Tuples(); i++) {
54+
for (i=0; i < data.Tuples(); i++) {
5555
for (int j=0; j < nFields; j++)
5656
cout <<setiosflags(ios::right) <<setw(15) << data.GetValue(i,j);
5757
cout << endl;

‎src/interfaces/libpq++/examples/testlibpq2.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ int main()
4545
cout << endl << endl;
4646

4747
// next, print out the instances
48-
for (int i=0; i < data.Tuples(); i++) {
48+
for ( i=0; i < data.Tuples(); i++) {
4949
for (int j=0; j < nFields; j++)
5050
cout <<setiosflags(ios::right) <<setw(15) << data.GetValue(i,j);
5151
cout << endl;

‎src/interfaces/libpq++/examples/testlibpq3.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ int main()
4848
cout << endl << endl;
4949

5050
// next, print out the instances
51-
for (int i=0; i < cData.Tuples(); i++) {
51+
for ( i=0; i < cData.Tuples(); i++) {
5252
for (int j=0; j < nFields; j++)
5353
cout <<setiosflags(ios::right) <<setw(15) << cData.GetValue(i,j);
5454
cout << endl;

‎src/interfaces/libpq++/libpq++.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ extern "C" {
3131
#include"libpq-fe.h"
3232
}
3333

34-
staticchar rcsid[] ="$Id: libpq++.h,v 1.5 2000/01/26 05:58:47 momjian Exp $";
34+
staticchar rcsid[] ="$Id: libpq++.h,v 1.6 2000/03/02 02:00:58 momjian Exp $";
3535

36+
usingnamespacestd;
3637

3738
// ****************************************************************
3839
//

‎src/interfaces/libpq++/pgconnection.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
1414
* Portions Copyright (c) 1994, Regents of the University of California
1515
*
16-
* $Id: pgconnection.h,v 1.3 2000/01/26 05:58:47 momjian Exp $
16+
* $Id: pgconnection.h,v 1.4 2000/03/02 02:00:58 momjian Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -28,6 +28,7 @@ extern "C" {
2828
#include"libpq-fe.h"
2929
}
3030

31+
usingnamespacestd;
3132

3233
// ****************************************************************
3334
//

‎src/interfaces/odbc/GNUmakefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.11 1999/06/30 23:57:29 tgl Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.12 2000/03/02 02:01:00 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313
@SET_MAKE@
@@ -37,7 +37,7 @@ OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \
3737
pgtypes.o psqlodbc.o qresult.o results.o socket.o parse.o statement.o \
3838
gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX)
3939

40-
SHLIB_LINK= $(LIBS)
40+
SHLIB_LINK= $(LD_FLAGS)
4141

4242
# Shared library stuff, also default 'all' target
4343
include $(SRCDIR)/Makefile.shlib

‎src/makefiles/Makefile.irix5

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ MK_NO_LORDER= true
66
%.so: %.o
77
$(LD) -G -Bdynamic -shared -o $@ $<
88

9-
CFLAGS+= -U_NO_XOPEN4
10-
9+
CFLAGS+= -U_NO_XOPEN4 -woff 1164,1171,1185,1195,1552 -Wl,-woff,15 -Wl,-woff,84

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp