diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-08-16 04:32:49 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-08-16 04:32:49 +0000 |
| commit | d6ac61cd641baa7d7c4557fe01f03b8ae1de3bd7 (patch) | |
| tree | bdd6f97798038d6138a3d8daa7f1ae29857c161a /src/backend/utils/init/miscinit.c | |
| parent | 1395ac6c67db2f91a78f8f765015ab51ddc03c85 (diff) | |
| download | postgresql-d6ac61cd641baa7d7c4557fe01f03b8ae1de3bd7.tar.gz postgresql-d6ac61cd641baa7d7c4557fe01f03b8ae1de3bd7.zip | |
Seems some C compilers think 'restrict' is a fully reserved word.
Per buildfarm results from warthog.
Diffstat (limited to 'src/backend/utils/init/miscinit.c')
| -rw-r--r-- | src/backend/utils/init/miscinit.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 3b2cb2f9c89..2d979afeada 100644 --- 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); |