libpq++ Makefile uses -DDEBUG to turn on debugging trace to

/tmp/trace.out.
However, elog.h uses DEBUG as a log-level flag.  As a result, tracing is
turned on even if the libpq++.so is built with DEBUG commented out in
the Makefile.

This patch changes libpq++ to use DEBUGFILE instead (which is not
defined anywhere else).

Oliver Elphick

diff --git a/src/interfaces/libpq++/Makefile.in b/src/interfaces/libpq++/Makefile.in
index d851254..8b57910 100644 (file)
--- a/src/interfaces/libpq++/Makefile.in
+++ b/src/interfaces/libpq++/Makefile.in
@@ -6,7 +6,7 @@
 # Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.21 2000/03/08 01:58:37 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.22 2000/03/16 15:34:36 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -34,7 +34,7 @@ CXXFLAGS+=   -I$(SRCDIR)/backend \
              -I$(SRCHEADERDIR) \
              -I$(LIBPQDIR)
 
-#CXXFLAGS+= -DDEBUG
+#CXXFLAGS+= -DDEBUGFILE
 
 ifdef KRBVERS
 CXXFLAGS+= $(KRBFLAGS)

diff --git a/src/interfaces/libpq++/pgconnection.cc b/src/interfaces/libpq++/pgconnection.cc
index 3ba7f89..3afbb57 100644 (file)
--- a/src/interfaces/libpq++/pgconnection.cc
+++ b/src/interfaces/libpq++/pgconnection.cc
@@ -10,7 +10,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pgconnection.cc,v 1.6 1999/05/30 15:17:56 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pgconnection.cc,v 1.7 2000/03/16 15:34:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -49,7 +49,7 @@ PgConnection::PgConnection(const char* conninfo)
 PgConnection::~PgConnection()
 {
   // Terminate the debugging output if it was turned on
-  #if defined(DEBUG)
+  #if defined(DEBUGFILE)
        PQuntrace(pgConn);
   #endif
   
@@ -68,7 +68,7 @@ ConnStatusType PgConnection::Connect(const char* conninfo)
 {
 ConnStatusType cst;
   // Turn the trace on
-#if defined(DEBUG)
+#if defined(DEBUGFILE)
   FILE *debug = fopen("/tmp/trace.out","w");
   PQtrace(pgConn, debug);
 #endif