summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2009-07-13 00:42:18 +0000
committerTom Lane2009-07-13 00:42:18 +0000
commit0ef0b2ba31ce486475c8712a9048f27fbacf334e (patch)
tree4c2b7024656540a668c1301208320343a53e923f
parent3011b522e1593aa273386d7e6a3e08739826a07f (diff)
Fix up PGDLLIMPORT marking for standard_conforming_strings. Moving it
into a header file that plpgsql's scan.l can see broke the previous kluge. Per buildfarm results.
-rw-r--r--src/include/parser/parser.h2
-rw-r--r--src/pl/plpgsql/src/scan.l2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h
index 24aded5a3d..2aa4b4c2dc 100644
--- a/src/include/parser/parser.h
+++ b/src/include/parser/parser.h
@@ -28,7 +28,7 @@ typedef enum
/* GUC variables in scan.l (every one of these is a bad idea :-() */
extern int backslash_quote;
extern bool escape_string_warning;
-extern bool standard_conforming_strings;
+extern PGDLLIMPORT bool standard_conforming_strings;
/* Primary entry points for the raw parsing functions */
diff --git a/src/pl/plpgsql/src/scan.l b/src/pl/plpgsql/src/scan.l
index e4b1fd0d1c..5d7f497257 100644
--- a/src/pl/plpgsql/src/scan.l
+++ b/src/pl/plpgsql/src/scan.l
@@ -43,8 +43,6 @@ static int cur_line_num;
static int xcdepth = 0; /* depth of nesting in slash-star comments */
static char *dolqstart; /* current $foo$ quote start string */
-extern PGDLLIMPORT bool standard_conforming_strings;
-
bool plpgsql_SpaceScanned = false;
%}