diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 1999-05-03 23:48:26 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 1999-05-03 23:48:26 +0000 |
| commit | b6c732e63c18e1436154893e698dd206b3c45ab8 (patch) | |
| tree | 52137e28b3a5df1717c93ae4dd2638328655f4f0 /src | |
| parent | 210055ad614ae845686fdf9f8fc6b60301689cc8 (diff) | |
| download | postgresql-b6c732e63c18e1436154893e698dd206b3c45ab8.tar.gz | |
Correct declaration of array_map() so that it doesn't make
gcc quite so unhappy.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 4 | ||||
| -rw-r--r-- | src/include/utils/array.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index f8fe7e4222..8c5518bda3 100644 --- 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 7ea945bf5f..f0566ca6f9 100644 --- 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, |