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

Modified Files:
      Tag: REL_1_2_STABLE
	slony1_funcs.c 
Log Message:
Bug #16 - Change in function typenameTypeId() in PG 8.3 to have 3 args
http://www.slony.info/bugzilla/show_bug.cgi?id=16

Patch provided by Dave Page - thanks!



Index: slony1_funcs.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/backend/slony1_funcs.c,v
retrieving revision 1.53.2.2
retrieving revision 1.53.2.3
diff -C2 -d -r1.53.2.2 -r1.53.2.3
*** slony1_funcs.c	2 May 2007 21:37:07 -0000	1.53.2.2
--- slony1_funcs.c	22 Nov 2007 22:51:04 -0000	1.53.2.3
***************
*** 1352,1355 ****
--- 1352,1358 ----
  					makeString("xxid"));
  
+ #ifdef HAVE_TYPENAMETYPEID_3
+               xxid_typid = typenameTypeId(NULL,xxid_typename,NULL);
+ #else
  #ifdef HAVE_TYPENAMETYPEID_2
  		xxid_typid = typenameTypeId(NULL,xxid_typename);
***************
*** 1357,1360 ****
--- 1360,1364 ----
  		xxid_typid = typenameTypeId(xxid_typename);
  #endif
+ #endif
  		plan_types[0] = INT4OID;
  
***************
*** 1435,1438 ****
--- 1439,1445 ----
  			lappend(lappend(NIL, makeString(NameStr(cs->clustername))),
  					makeString("xxid"));
+ #ifdef HAVE_TYPENAMETYPEID_3
+                 xxid_typid = typenameTypeId(NULL, xxid_typename,NULL);
+ #else
  #ifdef HAVE_TYPENAMETYPEID_2
  		xxid_typid = typenameTypeId(NULL, xxid_typename);
***************
*** 1440,1443 ****
--- 1447,1451 ----
  		xxid_typid = typenameTypeId(xxid_typename);
  #endif
+ #endif
  
  		/*