Seems some C compilers think 'restrict' is a fully reserved word.

tglsfdc · tglsfdc · commit d6ac61cd641b · 2006-08-16T04:32:49.000Z
Per buildfarm results from warthog.
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.88 2006/08/15 18:26:58 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.89 2006/08/16 04:32:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -131,16 +131,16 @@ load_external_function(char *filename, char *funcname,
  * function in it.	If the same shlib has previously been loaded,
  * unload and reload it.
  *
- * When 'restrict' is true, only libraries in the presumed-secure
+ * When 'restricted' is true, only libraries in the presumed-secure
  * directory $libdir/plugins may be referenced.
  */
 void
-load_file(const char *filename, bool restrict)
+load_file(const char *filename, bool restricted)
 {
 	char	   *fullname;
 
 	/* Apply security restriction if requested */
-	if (restrict)
+	if (restricted)
 		check_restricted_library_name(filename);
 
 	/* Expand the possibly-abbreviated filename to an exact path name */
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.157 2006/08/15 18:26:59 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.158 2006/08/16 04:32:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1108,10 +1108,10 @@ char	   *local_preload_libraries_string = NULL;
  * load the shared libraries listed in 'libraries'
  *
  * 'gucname': name of GUC variable, for error reports
- * 'restrict': if true, force libraries to be in $libdir/plugins/
+ * 'restricted': if true, force libraries to be in $libdir/plugins/
  */
 static void
-load_libraries(const char *libraries, const char *gucname, bool restrict)
+load_libraries(const char *libraries, const char *gucname, bool restricted)
 {
 	char	   *rawstring;
 	List	   *elemlist;
@@ -1144,7 +1144,7 @@ load_libraries(const char *libraries, const char *gucname, bool restrict)
 		filename = pstrdup(tok);
 		canonicalize_path(filename);
 		/* If restricting, insert $libdir/plugins if not mentioned already */
-		if (restrict && first_dir_separator(filename) == NULL)
+		if (restricted && first_dir_separator(filename) == NULL)
 		{
 			char   *expanded;
 
@@ -1154,7 +1154,7 @@ load_libraries(const char *libraries, const char *gucname, bool restrict)
 			pfree(filename);
 			filename = expanded;
 		}
-		load_file(filename, restrict);
+		load_file(filename, restricted);
 		ereport(LOG,
 				(errmsg("loaded library \"%s\"", filename)));
 		pfree(filename);
diff --git a/src/include/fmgr.h b/src/include/fmgr.h
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/fmgr.h,v 1.46 2006/08/15 18:26:59 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/fmgr.h,v 1.47 2006/08/16 04:32:49 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -488,7 +488,7 @@ extern char *Dynamic_library_path;
 extern PGFunction load_external_function(char *filename, char *funcname,
 					   bool signalNotFound, void **filehandle);
 extern PGFunction lookup_external_function(void *filehandle, char *funcname);
-extern void load_file(const char *filename, bool restrict);
+extern void load_file(const char *filename, bool restricted);
 extern void **find_rendezvous_variable(const char *varName);
 
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.88 2006/08/15 18:26:58 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.89 2006/08/16 04:32:48 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -131,16 +131,16 @@ load_external_function(char filename, char funcname,`
`131`	`131`	`* function in it. If the same shlib has previously been loaded,`
`132`	`132`	`* unload and reload it.`
`133`	`133`	`*`
`134`		`- * When 'restrict' is true, only libraries in the presumed-secure`
	`134`	`+ * When 'restricted' is true, only libraries in the presumed-secure`
`135`	`135`	`* directory $libdir/plugins may be referenced.`
`136`	`136`	`*/`
`137`	`137`	`void`
`138`		`-load_file(const char *filename, bool restrict)`
	`138`	`+load_file(const char *filename, bool restricted)`
`139`	`139`	`{`
`140`	`140`	`char *fullname;`
`141`	`141`
`142`	`142`	`/* Apply security restriction if requested */`
`143`		`- if (restrict)`
	`143`	`+ if (restricted)`
`144`	`144`	`check_restricted_library_name(filename);`
`145`	`145`
`146`	`146`	`/* Expand the possibly-abbreviated filename to an exact path name */`