Correct declaration of array_map() so that it doesn't make

gcc quite so unhappy.

diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index f8fe7e42229878276d4c7b4f0bdd4d871a15175c..8c5518bda396b65655d9df21a2a1c33a3087f3f1 100644 (file)
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.39 1999/05/03 19:09:59 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.40 1999/05/03 23:48:26 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1287,7 +1287,7 @@ array_assgn(ArrayType *array,
 ArrayType *
 array_map(ArrayType *v,
                  Oid type,
-                 char *(fn)(char *p, ...),
+                 char * (*fn)(),
                  Oid retType,
                  int nargs,
                  ...)

diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index 7ea945bf5fb38e8997f45e3087e203facd5c8329..f0566ca6f93d9774387ab2b73614a94b07b91f77 100644 (file)
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: array.h,v 1.16 1999/05/03 19:10:25 momjian Exp $
+ * $Id: array.h,v 1.17 1999/05/03 23:48:25 tgl Exp $
  *
  * NOTES
  *       XXX the data array should be LONGALIGN'd -- notice that the array
@@ -126,7 +126,8 @@ extern char *array_set(ArrayType *array, int n, int *indx, char *dataPtr,
 extern char *array_assgn(ArrayType *array, int n, int *upperIndx,
                        int *lowerIndx, ArrayType *newArr, int reftype,
                        int len, bool *isNull);
-extern ArrayType *array_map(ArrayType *v, Oid type, char *(fn)(char *p, ...),
+extern ArrayType *array_map(ArrayType *v, Oid type,
+                                                       char * (*fn)(),
                                                        Oid retType, int nargs, ...);
 extern int     array_eq(ArrayType *array1, ArrayType *array2);
 extern int _LOtransfer(char **destfd, int size, int nitems, char **srcfd,