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

Per buildfarm results from warthog.

diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 3c2b34e3e63fa0656be478a8f69ddd92a51dd8f1..b95180d17efe7c18df912abf786d55dc14a2d09f 100644 (file)
--- 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
index 3b2cb2f9c89554fd08a69a34e4e8f40871f8b3b1..2d979afeada2f72952cf97d1d7d39b397c2fcf65 100644 (file)
--- 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
index 2e9e3f718209f7c19029ee27a8dbaa710c038cd9..4055fe715b04a6151c662deee599a45d6006744f 100644 (file)
--- 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);