diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/executor/executor.h | 10 | ||||
| -rw-r--r-- | src/include/utils/guc.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 5b121546d9..9eb7367f2e 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: executor.h,v 1.71 2002/07/20 05:49:28 momjian Exp $ + * $Id: executor.h,v 1.72 2002/07/20 15:12:55 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -132,11 +132,11 @@ extern void do_tup_output(TupOutputState *tstate, char **values); extern void do_text_output_multiline(TupOutputState *tstate, char *text); extern void end_tup_output(TupOutputState *tstate); -#define PROJECT_LINE_OF_TEXT(text_to_project) \ +#define PROJECT_LINE_OF_TEXT(tstate, text_to_project) \ do { \ - char *values[1]; \ - values[0] = text_to_project; \ - do_tup_output(tstate, values); \ + char *values_[1]; \ + values_[0] = (text_to_project); \ + do_tup_output(tstate, values_); \ } while (0) diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index 35c56eba76..17e4f3d652 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -4,7 +4,7 @@ * External declarations pertaining to backend/utils/misc/guc.c and * backend/utils/misc/guc-file.l * - * $Id: guc.h,v 1.18 2002/07/20 05:49:28 momjian Exp $ + * $Id: guc.h,v 1.19 2002/07/20 15:12:56 tgl Exp $ */ #ifndef GUC_H #define GUC_H @@ -86,8 +86,8 @@ extern bool set_config_option(const char *name, const char *value, bool isLocal, bool DoIt); extern void ShowGUCConfigOption(const char *name); extern void ShowAllGUCConfig(void); -extern char *GetConfigOptionByName(const char *name); -extern char *GetConfigOptionByNum(int varnum, char **varname); +extern char *GetConfigOptionByName(const char *name, const char **varname); +extern char *GetConfigOptionByNum(int varnum, const char **varname); extern int GetNumConfigOptions(void); extern void SetPGVariable(const char *name, List *args, bool is_local); |