Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit b6c732e

Browse files
committed
Correct declaration of array_map() so that it doesn't make
gcc quite so unhappy.
1 parent 210055a commit b6c732e

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/backend/utils/adt/arrayfuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.39 1999/05/03 19:09:59 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.40 1999/05/03 23:48:26 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1287,7 +1287,7 @@ array_assgn(ArrayType *array,
12871287
ArrayType *
12881288
array_map(ArrayType *v,
12891289
Oid type,
1290-
char *(fn)(char *p, ...),
1290+
char * (*fn)(),
12911291
Oid retType,
12921292
int nargs,
12931293
...)

src/include/utils/array.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* Copyright (c) 1994, Regents of the University of California
1212
*
13-
* $Id: array.h,v 1.16 1999/05/03 19:10:25 momjian Exp $
13+
* $Id: array.h,v 1.17 1999/05/03 23:48:25 tgl Exp $
1414
*
1515
* NOTES
1616
* 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,
126126
extern char *array_assgn(ArrayType *array, int n, int *upperIndx,
127127
int *lowerIndx, ArrayType *newArr, int reftype,
128128
int len, bool *isNull);
129-
extern ArrayType *array_map(ArrayType *v, Oid type, char *(fn)(char *p, ...),
129+
extern ArrayType *array_map(ArrayType *v, Oid type,
130+
char * (*fn)(),
130131
Oid retType, int nargs, ...);
131132
extern int array_eq(ArrayType *array1, ArrayType *array2);
132133
extern int _LOtransfer(char **destfd, int size, int nitems, char **srcfd,

0 commit comments

Comments
 (0)