*** pgsql/src/backend/utils/fmgr/fmgr.c	2008/03/25 22:42:45	1.114
--- pgsql/src/backend/utils/fmgr/fmgr.c	2008/04/17 21:37:28	1.115
***************
*** 8,14 ****
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.113 2008/01/03 21:23:15 tgl Exp $
   *
   *-------------------------------------------------------------------------
   */
--- 8,14 ----
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.114 2008/03/25 22:42:45 tgl Exp $
   *
   *-------------------------------------------------------------------------
   */
*************** fmgr_oldstyle(PG_FUNCTION_ARGS)
*** 827,833 ****
  			break;
  	}
  
! 	return (Datum) returnValue;
  }
  
  
--- 827,833 ----
  			break;
  	}
  
! 	return PointerGetDatum(returnValue);
  }
  
  
*************** fmgr(Oid procedureId,...)
*** 2008,2014 ****
  					flinfo.fn_oid, n_arguments, FUNC_MAX_ARGS)));
  		va_start(pvar, procedureId);
  		for (i = 0; i < n_arguments; i++)
! 			fcinfo.arg[i] = (Datum) va_arg(pvar, char *);
  		va_end(pvar);
  	}
  
--- 2008,2014 ----
  					flinfo.fn_oid, n_arguments, FUNC_MAX_ARGS)));
  		va_start(pvar, procedureId);
  		for (i = 0; i < n_arguments; i++)
! 			fcinfo.arg[i] = PointerGetDatum(va_arg(pvar, char *));
  		va_end(pvar);
  	}
  
*************** fmgr(Oid procedureId,...)
*** 2018,2024 ****
  	if (fcinfo.isnull)
  		elog(ERROR, "function %u returned NULL", flinfo.fn_oid);
  
! 	return (char *) result;
  }
  
  
--- 2018,2024 ----
  	if (fcinfo.isnull)
  		elog(ERROR, "function %u returned NULL", flinfo.fn_oid);
  
! 	return DatumGetPointer(result);
  }