Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd6ac61c

Browse files
committed
Seems some C compilers think 'restrict' is a fully reserved word.
Per buildfarm results from warthog.
1 parent1395ac6 commitd6ac61c

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

‎src/backend/utils/fmgr/dfmgr.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* 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 $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -131,16 +131,16 @@ load_external_function(char *filename, char *funcname,
131131
* function in it.If the same shlib has previously been loaded,
132132
* unload and reload it.
133133
*
134-
* When 'restrict' is true, only libraries in the presumed-secure
134+
* When 'restricted' is true, only libraries in the presumed-secure
135135
* directory $libdir/plugins may be referenced.
136136
*/
137137
void
138-
load_file(constchar*filename,boolrestrict)
138+
load_file(constchar*filename,boolrestricted)
139139
{
140140
char*fullname;
141141

142142
/* Apply security restriction if requested */
143-
if (restrict)
143+
if (restricted)
144144
check_restricted_library_name(filename);
145145

146146
/* Expand the possibly-abbreviated filename to an exact path name */

‎src/backend/utils/init/miscinit.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.157 2006/08/15 18:26:59 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.158 2006/08/16 04:32:48 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1108,10 +1108,10 @@ char *local_preload_libraries_string = NULL;
11081108
* load the shared libraries listed in 'libraries'
11091109
*
11101110
* 'gucname': name of GUC variable, for error reports
1111-
* 'restrict': if true, force libraries to be in $libdir/plugins/
1111+
* 'restricted': if true, force libraries to be in $libdir/plugins/
11121112
*/
11131113
staticvoid
1114-
load_libraries(constchar*libraries,constchar*gucname,boolrestrict)
1114+
load_libraries(constchar*libraries,constchar*gucname,boolrestricted)
11151115
{
11161116
char*rawstring;
11171117
List*elemlist;
@@ -1144,7 +1144,7 @@ load_libraries(const char *libraries, const char *gucname, bool restrict)
11441144
filename=pstrdup(tok);
11451145
canonicalize_path(filename);
11461146
/* If restricting, insert $libdir/plugins if not mentioned already */
1147-
if (restrict&&first_dir_separator(filename)==NULL)
1147+
if (restricted&&first_dir_separator(filename)==NULL)
11481148
{
11491149
char*expanded;
11501150

@@ -1154,7 +1154,7 @@ load_libraries(const char *libraries, const char *gucname, bool restrict)
11541154
pfree(filename);
11551155
filename=expanded;
11561156
}
1157-
load_file(filename,restrict);
1157+
load_file(filename,restricted);
11581158
ereport(LOG,
11591159
(errmsg("loaded library \"%s\"",filename)));
11601160
pfree(filename);

‎src/include/fmgr.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
1212
* Portions Copyright (c) 1994, Regents of the University of California
1313
*
14-
* $PostgreSQL: pgsql/src/include/fmgr.h,v 1.46 2006/08/15 18:26:59 tgl Exp $
14+
* $PostgreSQL: pgsql/src/include/fmgr.h,v 1.47 2006/08/16 04:32:49 tgl Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
@@ -488,7 +488,7 @@ extern char *Dynamic_library_path;
488488
externPGFunctionload_external_function(char*filename,char*funcname,
489489
boolsignalNotFound,void**filehandle);
490490
externPGFunctionlookup_external_function(void*filehandle,char*funcname);
491-
externvoidload_file(constchar*filename,boolrestrict);
491+
externvoidload_file(constchar*filename,boolrestricted);
492492
externvoid**find_rendezvous_variable(constchar*varName);
493493

494494

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp