From 529291be45b540d3a6977747584bcded89852f76 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Fri, 6 Jun 2003 09:51:03 +0000
Subject: INTEGRATION: CWS dba07 (1.19.2); FILE MERGED 2003/05/23 06:57:22 oj
 1.19.2.1: #i13385# fix flex 2.5.31 (which entered Debian unstable a few days
 ago) breaks building

---
 connectivity/source/parse/sqlflex.l | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'connectivity/source/parse')

diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index a4d0302916aa..297e6b0b3b42 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -2,7 +2,7 @@
 
 //--------------------------------------------------------------------------
 //
-// $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlflex.l,v 1.19 2003-05-19 12:58:56 vg Exp $
+// $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlflex.l,v 1.20 2003-06-06 10:51:03 vg Exp $
 //
 // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.
 //
@@ -10,7 +10,7 @@
 //	OJ
 //
 // Last change:
-//	$Author: vg $ $Date: 2003-05-19 12:58:56 $ $Revision: 1.19 $
+//	$Author: vg $ $Date: 2003-06-06 10:51:03 $ $Revision: 1.20 $
 //
 // Description:
 //
@@ -337,6 +337,19 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = NULL;
 .				{YY_FATAL_ERROR("Invalid symbol"); return SQL_TOKEN_INVALIDSYMBOL;}
 
 %%
+// Kludge around a bug (well, Posix incompatibility) in flex 2.5.x 
+// http://bugs.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=189332 
+#if YY_FLEX_MAJOR_VERSION >= 2 && YY_FLEX_MINOR_VERSION >= 5 
+ 
+  #ifndef YY_FLUSH_BUFFER 
+    #define YY_FLUSH_BUFFER SQLyy_flush_buffer(YY_CURRENT_BUFFER ) 
+  #endif 
+ 
+  #ifndef yytext_ptr 
+    #define yytext_ptr SQLyytext 
+  #endif 
+ 
+#endif 
 
 /*
  * Read SQL string literal
-- 
cgit