Update of /home/cvsd/slony1/slony1-engine/src/xxid
In directory main.slony.info:/tmp/cvs-serv10904/src/xxid

Modified Files:
      Tag: REL_1_2_STABLE
	xxid.c 
Log Message:
Changes to make 1.2 compile (and work) with PostgreSQL 8.4.

8.4 also breaks the ducttape tests, which use pgbench as a test
application. 8.4's pgbench prefixes all tables with pgbench_.
For now we can use 8.3's pgbench.


Jan


Index: xxid.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/xxid/Attic/xxid.c,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -C2 -d -r1.12.2.3 -r1.12.2.4
*** xxid.c	14 May 2007 22:04:49 -0000	1.12.2.3
--- xxid.c	23 Jul 2009 18:30:04 -0000	1.12.2.4
***************
*** 19,22 ****
--- 19,25 ----
  #include "access/transam.h"
  #include "executor/spi.h"
+ #ifdef HAVE_GETACTIVESNAPSHOT
+ #include "utils/snapmgr.h"
+ #endif
  
  #ifdef PG_MODULE_MAGIC
***************
*** 234,237 ****
--- 237,244 ----
  _Slony_I_getMinXid(PG_FUNCTION_ARGS)
  {
+ #ifdef HAVE_GETACTIVESNAPSHOT
+ 	Snapshot	SerializableSnapshot = GetActiveSnapshot();
+ #endif
+ 
  	if (SerializableSnapshot == NULL)
  		elog(ERROR, "Slony-I: SerializableSnapshot is NULL in getMinXid()");
***************
*** 247,250 ****
--- 254,260 ----
  _Slony_I_getMaxXid(PG_FUNCTION_ARGS)
  {
+ #ifdef HAVE_GETACTIVESNAPSHOT
+ 	Snapshot	SerializableSnapshot = GetActiveSnapshot();
+ #endif
  	if (SerializableSnapshot == NULL)
  		elog(ERROR, "Slony-I: SerializableSnapshot is NULL in getMaxXid()");