From 7540e5722f79d4d208db45549f1b3ea2a5accf15 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 8 Dec 2007 09:54:55 +0000 Subject: [PATCH] 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 --- bacula/src/cats/postgresql.c | 3 ++- bacula/technotes-2.1 | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bacula/src/cats/postgresql.c b/bacula/src/cats/postgresql.c index 5f3d5bcb88..6c6c38f76b 100644 --- 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 ce8a0482f8..2517a65646 100644 --- 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. -- 2.39.5