From e2422524aa81367b56a39a7d3ea9d1f395547d9c Mon Sep 17 00:00:00 2001
From: Marko Kreen <markokr@gmail.com>
Date: Fri, 8 Jan 2010 17:28:16 +0200
Subject: [PATCH] Fix standard_conforming_string incompat vs. 8.5

In 8.5:
- <parser/gramparse.h> is tagged as internal header
  It also defines now flex/bison symbols that conflict
  with plproxy parser.
- <parser/parser.h> describes external API

As the stdstr definition was problematic on older versions anyway,
define it explicitly for those.
---
 src/scanner.l | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/scanner.l b/src/scanner.l
index 36166c9..4b83a3e 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -23,8 +23,8 @@
 #include "parser.tab.h"
 
 /* import standard_conforming_strings */
-#ifndef WIN32
-#include <parser/gramparse.h>
+#if PG_VERSION_NUM >= 80500
+#include <parser/parser.h>
 #else
 #ifndef PGDLLIMPORT
 #define PGDLLIMPORT DLLIMPORT
@@ -32,7 +32,6 @@
 extern PGDLLIMPORT bool standard_conforming_strings;
 #endif
 
-
 /* shut down crappy flex warnings */
 int yyget_lineno(void);
 int yyget_leng(void);
-- 
2.39.5