Add new include to postgresql.c suggested by Marc Cousins so

     that it compiles correctly with pgre version 8.3.  Also fix
     misuse of %x with pointer (should be %p).

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@6026 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/cats/postgresql.c b/bacula/src/cats/postgresql.c
index 5f3d5bcb882869a2b392673cab803fb82b61b55b..6c6c38f76b23d54bfe1ae407eb948c51502abe81 100644 (file)
--- a/bacula/src/cats/postgresql.c
+++ b/bacula/src/cats/postgresql.c
@@ -47,6 +47,7 @@
 #ifdef HAVE_POSTGRESQL
 
 #include "postgres_ext.h"       /* needed for NAMEDATALEN */
+#include "pg_config_manual.h"   /* get NAMEDATALEN on version 8.3 or later */
 
 /* -----------------------------------------------------------------------
  *
@@ -386,7 +387,7 @@ POSTGRESQL_ROW my_postgresql_fetch_row(B_DB *mdb)
       Dmsg2(500, "my_postgresql_fetch_row row number '%d' is NOT acceptable (0..%d)\n", mdb->row_number, mdb->num_rows);
    }
 
-   Dmsg1(500, "my_postgresql_fetch_row finishes returning %x\n", row);
+   Dmsg1(500, "my_postgresql_fetch_row finishes returning %p\n", row);
 
    return row;
 }

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index ce8a0482f8da57bdcc608eddd0265de5cf9d4f8f..2517a6564604eabb31f62c39c0b5d275b943ddaf 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,10 @@
               Technical notes on version 2.2
 
 General:
+08Dec07
+kes  Add new include to postgresql.c suggested by Marc Cousins so
+     that it compiles correctly with pgre version 8.3.  Also fix
+     misuse of %x with pointer (should be %p).
 03Dec07
 kes  This patch fixes bcopy so that it produces correct Volumes.
      It fixes bug #1022.