From bd2d0983d44e1e8b3bee974d432aca500ddb32dc Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 2 Mar 2000 02:01:01 +0000
Subject: [PATCH] Patch for Irix from Mark Dalphin.

---
 src/interfaces/libpq++/examples/Makefile      | 3 ++-
 src/interfaces/libpq++/examples/testlibpq1.cc | 2 +-
 src/interfaces/libpq++/examples/testlibpq2.cc | 2 +-
 src/interfaces/libpq++/examples/testlibpq3.cc | 2 +-
 src/interfaces/libpq++/libpq++.h              | 3 ++-
 src/interfaces/libpq++/pgconnection.h         | 3 ++-
 src/interfaces/odbc/GNUmakefile.in            | 4 ++--
 src/makefiles/Makefile.irix5                  | 3 +--
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/interfaces/libpq++/examples/Makefile b/src/interfaces/libpq++/examples/Makefile
index 0e0c07cf5f..5e277ade32 100644
--- a/src/interfaces/libpq++/examples/Makefile
+++ b/src/interfaces/libpq++/examples/Makefile
@@ -12,7 +12,8 @@ LIBPQDIR= /usr/local/pgsql/lib
 # 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.
 
-CXXFLAGS= $(CFLAGS) -Wno-error -Wno-unused -Wl,-Bdynamic
+#CXXFLAGS= $(CFLAGS) -Wno-error -Wno-unused -Wl,-Bdynamic
+CXXFLAGS= $(CFLAGS)
 
 INCLUDE_OPT= -I$(HEADERDIR)
 
diff --git a/src/interfaces/libpq++/examples/testlibpq1.cc b/src/interfaces/libpq++/examples/testlibpq1.cc
index 6bd4c59edf..afaaf8b004 100644
--- a/src/interfaces/libpq++/examples/testlibpq1.cc
+++ b/src/interfaces/libpq++/examples/testlibpq1.cc
@@ -51,7 +51,7 @@ int main()
   cout << endl << endl;
 
   // 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++)
             cout << setiosflags(ios::right) << setw(15) << data.GetValue(i,j);
        cout << endl;
diff --git a/src/interfaces/libpq++/examples/testlibpq2.cc b/src/interfaces/libpq++/examples/testlibpq2.cc
index 05921d5dc5..719dd20cb4 100644
--- a/src/interfaces/libpq++/examples/testlibpq2.cc
+++ b/src/interfaces/libpq++/examples/testlibpq2.cc
@@ -45,7 +45,7 @@ int main()
   cout << endl << endl;
 
   // 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++)
             cout << setiosflags(ios::right) << setw(15) << data.GetValue(i,j);
        cout << endl;
diff --git a/src/interfaces/libpq++/examples/testlibpq3.cc b/src/interfaces/libpq++/examples/testlibpq3.cc
index 8585eae09c..adf687d3a1 100644
--- a/src/interfaces/libpq++/examples/testlibpq3.cc
+++ b/src/interfaces/libpq++/examples/testlibpq3.cc
@@ -48,7 +48,7 @@ int main()
   cout << endl << endl;
 
   // 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++)
             cout << setiosflags(ios::right) << setw(15) << cData.GetValue(i,j);
        cout << endl;
diff --git a/src/interfaces/libpq++/libpq++.h b/src/interfaces/libpq++/libpq++.h
index d88424bdd5..1f227c3b74 100644
--- a/src/interfaces/libpq++/libpq++.h
+++ b/src/interfaces/libpq++/libpq++.h
@@ -31,8 +31,9 @@ extern "C" {
 #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;
 
 // ****************************************************************
 //
diff --git a/src/interfaces/libpq++/pgconnection.h b/src/interfaces/libpq++/pgconnection.h
index 97397c2dc7..6d3baee5eb 100644
--- a/src/interfaces/libpq++/pgconnection.h
+++ b/src/interfaces/libpq++/pgconnection.h
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * 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"
 }
 
+using namespace std;
 
 // ****************************************************************
 //
diff --git a/src/interfaces/odbc/GNUmakefile.in b/src/interfaces/odbc/GNUmakefile.in
index 79883ab79f..8819b7271f 100644
--- a/src/interfaces/odbc/GNUmakefile.in
+++ b/src/interfaces/odbc/GNUmakefile.in
@@ -7,7 +7,7 @@
 #
 #
 # 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@
@@ -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 \
         gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX)
 
-SHLIB_LINK= $(LIBS)
+SHLIB_LINK= $(LD_FLAGS)
 
 # Shared library stuff, also default 'all' target
 include $(SRCDIR)/Makefile.shlib
diff --git a/src/makefiles/Makefile.irix5 b/src/makefiles/Makefile.irix5
index 7cdf43cbe1..2dec27246b 100644
--- a/src/makefiles/Makefile.irix5
+++ b/src/makefiles/Makefile.irix5
@@ -6,5 +6,4 @@ MK_NO_LORDER= true
 %.so: %.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