6 files changed, 24 insertions, 20 deletions
diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index d6519cd132c..15294ce06cc 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -21,6 +21,8 @@
 #include <utils/rel.h>
 #include <storage/off.h>
 
+#include <fmgr.h>
+
 /*
 ** You can have as many strategies as you please in GiSTs, as
 ** long as your consistent method can handle them
@@ -71,13 +73,13 @@ typedef struct GISTSTACK
 
 typedef struct GISTSTATE
 {
-	func_ptr	consistentFn;
-	func_ptr	unionFn;
-	func_ptr	compressFn;
-	func_ptr	decompressFn;
-	func_ptr	penaltyFn;
-	func_ptr	picksplitFn;
-	func_ptr	equalFn;
+	FmgrInfo	consistentFn;
+	FmgrInfo	unionFn;
+	FmgrInfo	compressFn;
+	FmgrInfo	decompressFn;
+	FmgrInfo	penaltyFn;
+	FmgrInfo	picksplitFn;
+	FmgrInfo	equalFn;
 	bool		haskeytype;
 	bool		keytypbyval;
 } GISTSTATE;
diff --git a/src/include/access/skey.h b/src/include/access/skey.h
index f40efc1e5b4..4cbf18197f2 100644
--- a/src/include/access/skey.h
+++ b/src/include/access/skey.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: skey.h,v 1.6 1997/09/08 21:51:01 momjian Exp $
+ * $Id: skey.h,v 1.7 1998/01/15 19:46:18 pgsql Exp $
  *
  *
  * Note:
@@ -17,13 +17,14 @@
 #define SKEY_H
 
 #include <access/attnum.h>
+#include <fmgr.h>
 
 typedef struct ScanKeyData
 {
 	bits16		sk_flags;		/* flags */
 	AttrNumber	sk_attno;		/* domain number */
 	RegProcedure sk_procedure;	/* procedure OID */
-	func_ptr	sk_func;
+	FmgrInfo	sk_func;
 	int32		sk_nargs;
 	Datum		sk_argument;	/* data to compare */
 } ScanKeyData;
diff --git a/src/include/access/valid.h b/src/include/access/valid.h
index 555ef7446b4..9a95d9c3329 100644
--- a/src/include/access/valid.h
+++ b/src/include/access/valid.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: valid.h,v 1.11 1997/11/24 05:09:41 momjian Exp $
+ * $Id: valid.h,v 1.12 1998/01/15 19:46:18 pgsql Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -71,13 +71,13 @@ do \
 			break; \
 		} \
  \
-		if (__cur_keys->sk_func == (func_ptr) oideq)	/* optimization */ \
+		if (__cur_keys->sk_func.fn_addr == (func_ptr) oideq)	/* optimization */ \
 			__test = (__cur_keys->sk_argument == __atp); \
 		else if (__cur_keys->sk_flags & SK_COMMUTE) \
-			__test = (long) FMGR_PTR2(__cur_keys->sk_func, __cur_keys->sk_procedure, \
+			__test = (long) FMGR_PTR2(&__cur_keys->sk_func, \
 									__cur_keys->sk_argument, __atp); \
 		else \
-			__test = (long) FMGR_PTR2(__cur_keys->sk_func, __cur_keys->sk_procedure, \
+			__test = (long) FMGR_PTR2(&__cur_keys->sk_func, \
 									__atp, __cur_keys->sk_argument); \
  \
 		if (!__test == !(__cur_keys->sk_flags & SK_NEGATE)) \
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index 2f72f767e5b..250e8952dd0 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: vacuum.h,v 1.11 1997/11/26 01:26:08 momjian Exp $
+ * $Id: vacuum.h,v 1.12 1998/01/15 19:46:24 pgsql Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -78,7 +78,7 @@ typedef struct
 				nonnull_cnt;
 	int32		max_cnt,
 				min_cnt;
-	func_ptr	f_cmpeq,
+	FmgrInfo	f_cmpeq,
 				f_cmplt,
 				f_cmpgt;
 	regproc		outfunc;
diff --git a/src/include/utils/fcache.h b/src/include/utils/fcache.h
index f9ace84b13a..504ac8e2adb 100644
--- a/src/include/utils/fcache.h
+++ b/src/include/utils/fcache.h
@@ -6,19 +6,21 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fcache.h,v 1.5 1997/09/08 21:54:57 momjian Exp $
+ * $Id: fcache.h,v 1.6 1998/01/15 19:46:36 pgsql Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef FCACHE_H
 #define FCACHE_H
 
+#include <fmgr.h>
+
 
 typedef struct
 {
 	int			typlen;			/* length of the return type */
 	int			typbyval;		/* true if return type is pass by value */
-	func_ptr	func;			/* address of function to call (for c
+	FmgrInfo	func;			/* address of function to call (for c
 								 * funcs) */
 	Oid			foid;			/* oid of the function in pg_proc */
 	Oid			language;		/* oid of the language in pg_language */
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 2de7b31671d..cbfa4dfba46 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel.h,v 1.14 1997/11/21 19:12:32 momjian Exp $
+ * $Id: rel.h,v 1.15 1998/01/15 19:46:37 pgsql Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,8 +24,7 @@ typedef struct Trigger
 {
 	char	   *tgname;
 	Oid			tgfoid;
-	func_ptr	tgfunc;
-	func_ptr	tgplfunc;
+	FmgrInfo	tgfunc;
 	int16		tgtype;
 	int16		tgnargs;
 	int16		tgattr[8];