Make number of args to a function configurable.

4 files changed, 8 insertions, 9 deletions

diff --git a/src/include/access/funcindex.h b/src/include/access/funcindex.h
index cfa54d81fe9..7106d1c1940 100644
--- a/src/include/access/funcindex.h
+++ b/src/include/access/funcindex.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: funcindex.h,v 1.7 1999/02/13 23:20:50 momjian Exp $
+ * $Id: funcindex.h,v 1.8 2000/01/10 17:14:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 typedef struct
 {
 	int			nargs;
-	Oid			arglist[8];
+	Oid			arglist[FUNC_MAX_ARGS];
 	Oid			procOid;
 	NameData	funcName;
 } FuncIndexInfo;
diff --git a/src/include/config.h.in b/src/include/config.h.in
index c5a55a5fb36..c731bea4425 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -93,9 +93,11 @@
 #define INDEXSCAN_PATCH 
 
 /*
- * Maximum number of columns in an index.
+ * Maximum number of columns in an index and maximum number of args
+ * to a function. They must be the same value.
  */
 #define INDEX_MAX_KEYS		8
+#define FUNC_MAX_ARGS		INDEX_MAX_KEYS
 
 /*
  * Enables debugging print statements in the date/time support routines.
diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h
index 04b9c44ec0e..73262d43375 100644
--- a/src/include/parser/parse_func.h
+++ b/src/include/parser/parse_func.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_func.h,v 1.20 1999/12/10 07:37:33 tgl Exp $
+ * $Id: parse_func.h,v 1.21 2000/01/10 17:14:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,9 +15,6 @@
 
 #include "parser/parse_node.h"
 
-
-#define MAXFARGS 8				/* max # args to a c or postquel function */
-
 /*
  *	This structure is used to explore the inheritance hierarchy above
  *	nodes in the type tree in order to disambiguate among polymorphic
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 689d5d02950..84bbe0950e0 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.30 1999/11/16 04:14:03 momjian Exp $
+ * $Id: rel.h,v 1.31 2000/01/10 17:14:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -51,7 +51,7 @@ typedef struct Trigger
 	bool		tgdeferrable;
 	bool		tginitdeferred;
 	int16		tgnargs;
-	int16		tgattr[8];
+	int16		tgattr[FUNC_MAX_ARGS];
 	char	  **tgargs;
 } Trigger;