Fix up PGDLLIMPORT marking for standard_conforming_strings. Moving it

tglsfdc · tglsfdc · commit f1d9c299d6e2 · 2009-07-13T00:42:18.000Z
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
@@ -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
@@ -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;
 %}
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.70 2009/06/10 22:34:11 petere Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.71 2009/07/13 00:42:18 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -43,8 +43,6 @@ static int cur_line_num;`
`43`	`43`	`static int xcdepth = 0; /* depth of nesting in slash-star comments */`
`44`	`44`	`static char dolqstart; / current $foo$ quote start string */`
`45`	`45`
`46`		`-extern PGDLLIMPORT bool standard_conforming_strings;`
`47`		`-`
`48`	`46`	`bool plpgsql_SpaceScanned = false;`
`49`	`47`	`%}`
`50`	`48`