From: Jorgen Austvik - Sun Norway <Jorgen.Austvik@Sun.COM>
Subject: [Slony1-hackers] Slony-I REL_1_2_STABLE compile against PostgreSQL HEAD
To: slony1-hackers@lists.slony.info
Date: Fri, 28 Mar 2008 13:43:50 +0100

Sorry, the include was needed two places to compile against PostgreSQL
HEAD. It might be better to place it in some common header, though?

The attached patch fixes a compile problem on at least Solaris and
Linux against PostgreSQL HEAD from CVS.

-J
Index: src/backend/slony1_funcs.c
===================================================================
RCS file: /slony1/slony1-engine/src/backend/slony1_funcs.c,v
retrieving revision 1.53.2.3
diff -c -p -u -r1.53.2.3 slony1_funcs.c
--- src/backend/slony1_funcs.c	22 Nov 2007 22:51:04 -0000	1.53.2.3
+++ src/backend/slony1_funcs.c	28 Mar 2008 12:40:09 -0000
@@ -12,6 +12,7 @@
 
 #include "postgres.h"
 #include "config.h"
+#include "utils/snapmgr.h"
 
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
Index: src/slonik/Makefile
===================================================================
RCS file: /slony1/slony1-engine/src/slonik/Makefile,v
retrieving revision 1.24.2.2
diff -c -p -u -r1.24.2.2 Makefile
--- src/slonik/Makefile	7 Mar 2008 19:01:37 -0000	1.24.2.2
+++ src/slonik/Makefile	28 Mar 2008 12:40:09 -0000
@@ -18,7 +18,7 @@ endif
 
 CFLAGS += -I$(slony_top_builddir) -DPGSHARE="\"$(pgsharedir)\"" -DPG_VERSION_MAJOR=$(PG_VERSION_MAJOR)
 ifneq ($(PG_VERSION_MAJOR), 7)
-LDFLAGS += -lpgport
+ LDFLAGS += -lpgport
 endif
 
 PROG		= slonik
Index: src/xxid/xxid.c
===================================================================
RCS file: /slony1/slony1-engine/src/xxid/xxid.c,v
retrieving revision 1.12.2.3
diff -c -p -u -r1.12.2.3 xxid.c
--- src/xxid/xxid.c	14 May 2007 22:04:49 -0000	1.12.2.3
+++ src/xxid/xxid.c	28 Mar 2008 12:40:09 -0000
@@ -12,6 +12,7 @@
 
 #include "config.h"
 #include "postgres.h"
+#include "utils/snapmgr.h"
 
 #include <limits.h>
 

-- 
(quoted-printable J=C3=B8rgen Austvik) <jorgen.austvik@sun.com>     Work: +47 73 84 21 10 
Senior Engineer                                                     Fax:  +47 73 84 21 01
Sun Microsystems
Database Technology Group
Haakon VII gt. 7b
Trondheim, NO-7485 Norway_______________________________________________
Slony1-hackers mailing list
Slony1-hackers@lists.slony.info
http://lists.slony.info/mailman/listinfo/slony1-hackers