*** pljava-1.4.0/src/C/pljava/SubXactListener.c.orig	2009-01-09 09:02:05.000000000 +0000
--- src/C/pljava/SubXactListener.c	2009-01-09 09:04:32.000000000 +0000
***************
*** 11,16 ****
--- 11,18 ----
  #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;
*** pljava-1.4.0/src/C/pljava/Backend.c	2008-07-15 13:11:04.000000000 +0500
--- src/C/pljava/Backend.c	2008-11-27 19:20:12.554124560 +0500
***************
*** 555,602 ****
  
  		checkIntTimeType();
  		HashMap_initialize();
  	
! 		DefineCustomStringVariable(
! 			"pljava.vmoptions",
! 			"Options sent to the JVM when it is created",
! 			NULL,
! 			&vmoptions,
! 			PGC_USERSET,
! 			NULL, NULL);
! 	
! 		DefineCustomStringVariable(
! 			"pljava.classpath",
! 			"Classpath used by the JVM",
! 			NULL,
! 			&classpath,
! 			PGC_USERSET,
! 			NULL, NULL);
! 	
! 		DefineCustomBoolVariable(
! 			"pljava.debug",
! 			"Stop the backend to attach a debugger",
! 			NULL,
! 			&pljavaDebug,
! 			PGC_USERSET,
! 			NULL, NULL);
! 	
! 		DefineCustomIntVariable(
! 			"pljava.statement_cache_size",
! 			"Size of the prepared statement MRU cache",
! 			NULL,
! 			&statementCacheSize,
! 			0, 512,
! 			PGC_USERSET,
! 			NULL, NULL);
! 	
! 		DefineCustomBoolVariable(
! 			"pljava.release_lingering_savepoints",
! 			"If true, lingering savepoints will be released on function exit. If false, the will be rolled back",
! 			NULL,
! 			&pljavaReleaseLingeringSavepoints,
! 			PGC_USERSET,
! 			NULL, NULL);
  	
  		EmitWarningsOnPlaceholders("pljava");
  			s_firstTimeInit = false;
  	}
--- 555,656 ----
  
  		checkIntTimeType();
  		HashMap_initialize();
+ 		
+ 		#if (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)
+ 			DefineCustomStringVariable(
+ 				"pljava.vmoptions",
+ 				"Options sent to the JVM when it is created",
+ 				NULL,
+ 				&vmoptions,
+ 				NULL,
+ 				PGC_USERSET,
+ 				0,
+ 				NULL, NULL);
+ 		
+ 			DefineCustomStringVariable(
+ 				"pljava.classpath",
+ 				"Classpath used by the JVM",
+ 				NULL,
+ 				&classpath,
+ 				NULL,
+ 				PGC_USERSET,
+ 				0,
+ 				NULL, NULL);
  	
! 			DefineCustomBoolVariable(
! 				"pljava.debug",
! 				"Stop the backend to attach a debugger",
! 				NULL,
! 				&pljavaDebug,
! 				NULL,
! 				PGC_USERSET,
! 				0,
! 				NULL, NULL);
! 		
! 			DefineCustomIntVariable(
! 				"pljava.statement_cache_size",
! 				"Size of the prepared statement MRU cache",
! 				NULL,
! 				&statementCacheSize,
! 				0, 512,
! 				NULL,
! 				PGC_USERSET,
! 				0,
! 				NULL, NULL);
! 		
! 			DefineCustomBoolVariable(
! 				"pljava.release_lingering_savepoints",
! 				"If true, lingering savepoints will be released on function exit. If false, the will be rolled back",
! 				NULL,
! 				&pljavaReleaseLingeringSavepoints,
! 				NULL,
! 				PGC_USERSET,
! 				0,
! 				NULL, NULL);
! 		#else
! 			
! 			DefineCustomStringVariable(
! 				"pljava.vmoptions",
! 				"Options sent to the JVM when it is created",
! 				NULL,
! 				&vmoptions,
! 				PGC_USERSET,
! 				NULL, NULL);
! 		
! 			DefineCustomStringVariable(
! 				"pljava.classpath",
! 				"Classpath used by the JVM",
! 				NULL,
! 				&classpath,
! 				PGC_USERSET,
! 				NULL, NULL);
  	
+ 			DefineCustomBoolVariable(
+ 				"pljava.debug",
+ 				"Stop the backend to attach a debugger",
+ 				NULL,
+ 				&pljavaDebug,
+ 				PGC_USERSET,
+ 				NULL, NULL);
+ 		
+ 			DefineCustomIntVariable(
+ 				"pljava.statement_cache_size",
+ 				"Size of the prepared statement MRU cache",
+ 				NULL,
+ 				&statementCacheSize,
+ 				0, 512,
+ 				PGC_USERSET,
+ 				NULL, NULL);
+ 		
+ 			DefineCustomBoolVariable(
+ 				"pljava.release_lingering_savepoints",
+ 				"If true, lingering savepoints will be released on function exit. If false, the will be rolled back",
+ 				NULL,
+ 				&pljavaReleaseLingeringSavepoints,
+ 				PGC_USERSET,
+ 				NULL, NULL);
+ 		#endif
+ 			
  		EmitWarningsOnPlaceholders("pljava");
  			s_firstTimeInit = false;
  	}