mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Per buildfarm results from warthog.
This commit is contained in:
Tom Lane 2006-08-16 04:32:49 +00:00
parent 1395ac6c67
commit d6ac61cd64
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/utils/fmgr/dfmgr.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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, * function in it. If the same shlib has previously been loaded,
* unload and reload it. * 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. * directory $libdir/plugins may be referenced.
*/ */
void void
load_file(const char *filename, bool restrict) load_file(const char *filename, bool restricted)
{ {
char *fullname; char *fullname;
/* Apply security restriction if requested */ /* Apply security restriction if requested */
if (restrict) if (restricted)
check_restricted_library_name(filename); check_restricted_library_name(filename);
/* Expand the possibly-abbreviated filename to an exact path name */ /* Expand the possibly-abbreviated filename to an exact path name */

10
src/backend/utils/init/miscinit.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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' * load the shared libraries listed in 'libraries'
* *
* 'gucname': name of GUC variable, for error reports * '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 static void
load_libraries(const char *libraries, const char *gucname, bool restrict) load_libraries(const char *libraries, const char *gucname, bool restricted)
{ {
char *rawstring; char *rawstring;
List *elemlist; List *elemlist;
@ -1144,7 +1144,7 @@ load_libraries(const char *libraries, const char *gucname, bool restrict)
filename = pstrdup(tok); filename = pstrdup(tok);
canonicalize_path(filename); canonicalize_path(filename);
/* If restricting, insert $libdir/plugins if not mentioned already */ /* 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; char *expanded;
@ -1154,7 +1154,7 @@ load_libraries(const char *libraries, const char *gucname, bool restrict)
pfree(filename); pfree(filename);
filename = expanded; filename = expanded;
} }
load_file(filename, restrict); load_file(filename, restricted);
ereport(LOG, ereport(LOG,
(errmsg("loaded library \"%s\"", filename))); (errmsg("loaded library \"%s\"", filename)));
pfree(filename); pfree(filename);

4
src/include/fmgr.h
View File

@ -11,7 +11,7 @@
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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, extern PGFunction load_external_function(char *filename, char *funcname,
bool signalNotFound, void **filehandle); bool signalNotFound, void **filehandle);
extern PGFunction lookup_external_function(void *filehandle, char *funcname); 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); extern void **find_rendezvous_variable(const char *varName);