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 a3fe8c310fded53aa208c2a699b9bf4c25d3905e..eb26cab260a4743e8ae07011c31db8c383dad80d 100644 (file)
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -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 44be29c3f63786699f9e5c69f8db73a7dddc0f56..2a96768778086bc50382c7cdc611391f43f87298 100644 (file)
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -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,