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.

diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h
index becc24a9a94fb2a91f5764e0cd9eae8dd8172999..296e8d748fc63ee504890f097c6cb98956c79864 100644 (file)
--- a/src/include/parser/parser.h
+++ b/src/include/parser/parser.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/parser/parser.h,v 1.26 2009/07/12 17:12:34 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/parser/parser.h,v 1.27 2009/07/13 00:42:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 b5d9b470a037110326ffc57d99aa88cb388f65b7..24497791205eb2e9955404b38f3b04dcde47550d 100644 (file)
--- a/src/pl/plpgsql/src/scan.l
+++ b/src/pl/plpgsql/src/scan.l
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.70 2009/06/10 22:34:11 petere Exp $
+ *       $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.71 2009/07/13 00:42:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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;
 %}