From 68181b1bd9ebc82614a39969fa2f4e7c5db2b266 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 3 May 1999 23:48:26 +0000 Subject: [PATCH] Correct declaration of array_map() so that it doesn't make gcc quite so unhappy. --- src/backend/utils/adt/arrayfuncs.c | 2 +- src/include/utils/array.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index a3fe8c310f..eb26cab260 100644 --- 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 44be29c3f6..2a96768778 100644 --- 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, -- 2.39.5