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

tglsfdc · tglsfdc · commit b6c732e63c18 · 1999-05-03T23:48:26.000Z
gcc quite so unhappy.
diff --git 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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* 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 $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1287,7 +1287,7 @@ array_assgn(ArrayType *array,`
`1287`	`1287`	`ArrayType *`
`1288`	`1288`	`array_map(ArrayType *v,`
`1289`	`1289`	`Oid type,`
`1290`		`- char (fn)(char p, ...),`
	`1290`	`+ char * (*fn)(),`
`1291`	`1291`	`Oid retType,`
`1292`	`1292`	`int nargs,`
`1293`	`1293`	`...)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`* Copyright (c) 1994, Regents of the University of California`
`12`	`12`	`*`
`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 $`
`14`	`14`	`*`
`15`	`15`	`* NOTES`
`16`	`16`	`* 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,`
`126`	`126`	`extern char array_assgn(ArrayType array, int n, int *upperIndx,`
`127`	`127`	`int lowerIndx, ArrayType newArr, int reftype,`
`128`	`128`	`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)(),`
`130`	`131`	`Oid retType, int nargs, ...);`
`131`	`132`	`extern int array_eq(ArrayType array1, ArrayType array2);`
`132`	`133`	`extern int _LOtransfer(char destfd, int size, int nitems, char srcfd,`