diff options
| author | Michael Meskes <meskes@postgresql.org> | 2014-10-22 10:35:36 +0200 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2014-10-22 16:46:55 +0200 |
| commit | 2ae7811db87bf54e8a70aae3cfd9f7cc7eff0bc4 (patch) | |
| tree | 7bf6b26d59cea502fa5f3f04957915b3e8e5e09b | |
| parent | 98b37437796bb5fedecf0d0c73cef4aa2ce9d192 (diff) | |
| download | postgresql-2ae7811db87bf54e8a70aae3cfd9f7cc7eff0bc4.tar.gz postgresql-2ae7811db87bf54e8a70aae3cfd9f7cc7eff0bc4.zip | |
Small code cleanup.
Declare static variable as static and external as extern.
| -rw-r--r-- | src/interfaces/ecpg/preproc/ecpg.header | 2 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/ecpg_keywords.c | 4 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/extern.h | 4 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/keywords.c | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header index 9c5018c2490..a2be29c4348 100644 --- a/src/interfaces/ecpg/preproc/ecpg.header +++ b/src/interfaces/ecpg/preproc/ecpg.header @@ -59,7 +59,7 @@ static char *forward_name = NULL; struct ECPGtype ecpg_no_indicator = {ECPGt_NO_INDICATOR, NULL, NULL, NULL, {NULL}, 0}; struct variable no_indicator = {"no_indicator", &ecpg_no_indicator, 0, NULL}; -struct ECPGtype ecpg_query = {ECPGt_char_variable, NULL, NULL, NULL, {NULL}, 0}; +static struct ECPGtype ecpg_query = {ECPGt_char_variable, NULL, NULL, NULL, {NULL}, 0}; /* * Handle parsing errors and warnings diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c index fb54d7b5c6d..7f7041ffd8d 100644 --- a/src/interfaces/ecpg/preproc/ecpg_keywords.c +++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c @@ -16,10 +16,6 @@ #include "extern.h" #include "preproc.h" -/* Globals from keywords.c */ -extern const ScanKeyword SQLScanKeywords[]; -extern const int NumSQLScanKeywords; - /* * List of (keyword-name, keyword-token-value) pairs. * diff --git a/src/interfaces/ecpg/preproc/extern.h b/src/interfaces/ecpg/preproc/extern.h index efe74c718ee..dfc75bceec2 100644 --- a/src/interfaces/ecpg/preproc/extern.h +++ b/src/interfaces/ecpg/preproc/extern.h @@ -58,6 +58,10 @@ extern struct when when_error, when_warn; extern struct ECPGstruct_member *struct_member_list[STRUCT_DEPTH]; +/* Globals from keywords.c */ +extern const ScanKeyword SQLScanKeywords[]; +extern const int NumSQLScanKeywords; + /* functions */ extern const char *get_dtype(enum ECPGdtype); diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c index 178a70427f3..73d31c74719 100644 --- a/src/interfaces/ecpg/preproc/keywords.c +++ b/src/interfaces/ecpg/preproc/keywords.c @@ -17,6 +17,7 @@ #include "parser/keywords.h" #include "type.h" +#include "extern.h" #include "preproc.h" #define PG_KEYWORD(a,b,c) {a,b,c}, |