diff --git a/src/interfaces/libpq++/examples/Makefile b/src/interfaces/libpq++/examples/Makefile
index 0e0c07cf5fe9a26e6e764bb71b735687981ee0b2..5e277ade32377656d6ac404fdf535a4c64d7fde2 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 6bd4c59edfa06abec2844ce15644f7c390af9906..afaaf8b0045005ab033c5b78f1b3bcbe92f2bd3b 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 05921d5dc5d93baaab5d570796a6f7f4bacea9ad..719dd20cb499ac7024b31e14234bdffbf8642ef5 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 8585eae09c524d7f836353ebb46d58c31024bd98..adf687d3a1ee6996a9764c071e83db8d44bcf70b 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 d88424bdd543edafa83ef37df835ea7898b13fc7..1f227c3b741fee83edeaa59df9e3bcc0d41bbe43 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 97397c2dc751f39cc0b75756537259db1eb5019f..6d3baee5eb95eba3f76434e505dc91ef77e1f381 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 79883ab79fe7a84920f307e35698f232d4d5ff80..8819b7271fc72285d65da65216d32d1502b36578 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 7cdf43cbe159b2681afeb051f952940cb9cb0d11..2dec27246b37e6e1bd263d2114466df92310e05f 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