[patch] dev-db/pljava/files/pljava-1.4.0-compile-against-8.4.patch

pljava-1.4.0-compile-against-8.4.patch (text/plain), 2.19 KB, created by unlord on 2010-01-27 23:12:43 UTC

--- pljava-1.4.0.orig/src/C/pljava/Backend.c	2008-02-01 02:37:58.000000000 -0500
+++ pljava-1.4.0/src/C/pljava/Backend.c	2010-01-21 17:09:57.000000000 -0500
@@ -561,7 +561,13 @@
 			"Options sent to the JVM when it is created",
 			NULL,
 			&vmoptions,
+			#if (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)
+				NULL,
+			#endif
 			PGC_USERSET,
+			#if (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)
+				0,
+			#endif
 			NULL, NULL);
 	
 		DefineCustomStringVariable(
@@ -569,7 +575,13 @@
 			"Classpath used by the JVM",
 			NULL,
 			&classpath,
+			#if (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)
+				NULL,
+			#endif
 			PGC_USERSET,
+			#if (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)
+				0,
+			#endif
 			NULL, NULL);
 	
 		DefineCustomBoolVariable(
@@ -577,7 +589,13 @@
 			"Stop the backend to attach a debugger",
 			NULL,
 			&pljavaDebug,
+			#if (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)
+				false,
+			#endif
 			PGC_USERSET,
+			#if (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)
+				0,
+			#endif
 			NULL, NULL);
 	
 		DefineCustomIntVariable(
@@ -585,8 +603,14 @@
 			"Size of the prepared statement MRU cache",
 			NULL,
 			&statementCacheSize,
+			#if (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)
+				11,
+			#endif
 			0, 512,
 			PGC_USERSET,
+			#if (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)
+				0,
+			#endif
 			NULL, NULL);
 	
 		DefineCustomBoolVariable(
@@ -594,7 +618,13 @@
 			"If true, lingering savepoints will be released on function exit. If false, the will be rolled back",
 			NULL,
 			&pljavaReleaseLingeringSavepoints,
+			#if (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)
+				false,
+			#endif
 			PGC_USERSET,
+			#if (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)
+				0,
+			#endif
 			NULL, NULL);
 	
 		EmitWarningsOnPlaceholders("pljava");
--- pljava-1.4.0.orig/src/C/pljava/SubXactListener.c	2008-02-01 02:37:58.000000000 -0500
+++ pljava-1.4.0/src/C/pljava/SubXactListener.c	2010-01-21 18:02:04.000000000 -0500
@@ -11,6 +11,8 @@
 #include "pljava/SPI.h"
 #include "org_postgresql_pljava_internal_SubXactListener.h"
 
+#include <access/xact.h>
+
 static jclass s_SubXactListener_class;
 static jmethodID s_SubXactListener_onStart;
 static jmethodID s_SubXactListener_onCommit;