[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/source idlc/source l10ntools/source

[Caolán McNamara]

 connectivity/source/parse/sqlflex.l |    2 +-
 idlc/source/scanner.l               |    2 +-
 l10ntools/source/cfglex.l           |    2 +-
 l10ntools/source/srclex.l           |    2 +-
 l10ntools/source/xrmlex.l           |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ac2bac4a8d5c7e1593f19a18ca0b5a65e1a3fd82
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu May 23 12:20:26 2013 +0100

    RHEL-5 baseline ver of flex doesn't have nounistd
    
    lets try this hack, if it fails revert and I'll just
    manually update the baseline with a newer flex than
    flex-2.5.4a-41.fc6
    
    Change-Id: If644489e80fc4e4cdba97808af0fe4d544d08646
    (cherry picked from commit 2ae6f9d1d27f699a6dcf369ba018c93ea7d5def5)

diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 166bbf6..0f7c3b5 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -60,6 +60,7 @@
 #endif
 /**/
 #endif
+#define YY_NO_UNISTD_H
 
 using namespace connectivity;
 
@@ -110,7 +111,6 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = NULL;
 
 %option noyywrap
 %option never-interactive
-%option nounistd
 %%
 
 ABS                 {SQL_NEW_KEYWORD(SQL_TOKEN_ABS);  }
diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index ca5119f..51204b8 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -257,11 +257,11 @@ static void parseLineAndFile(sal_Char* pBuf)
 #endif
 /**/
 #endif
+#define YY_NO_UNISTD_H
 %}
 
 %option noyywrap
 %option never-interactive
-%option nounistd
 
 %x DOCU
 %x COMMENT
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index a5c6988..501debd 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -53,6 +53,7 @@
 #elif defined _MSC_VER
 #pragma warning(push, 1)
 #endif
+#define YY_NO_UNISTD_H
 
 int yycolumn = 1;
 #define YY_USER_ACTION yycolumn += yyleng;
@@ -66,7 +67,6 @@ int bText=0;
 
 %option yylineno
 %option never-interactive
-%option nounistd
 
 %p 24000
 %e 1200
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 0f21955..91742a1 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -54,6 +54,7 @@
 #elif defined _MSC_VER
 #pragma warning(push, 1)
 #endif
+#define YY_NO_UNISTD_H
 
 /* external functions (C++ code, declared as extern "C" */
 extern "C" int WorkOnTokenSet( int, char* );
@@ -68,7 +69,6 @@ void YYWarning();
 
 %option yylineno
 %option never-interactive
-%option nounistd
 
 %p 24000
 %e 1200
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 7f28d3f..73e3bab 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -53,6 +53,7 @@
 #elif defined _MSC_VER
 #pragma warning(push, 1)
 #endif
+#define YY_NO_UNISTD_H
 
 /* external functions (C++ code, declared as extern "C" */
 extern "C" int WorkOnTokenSet( int, char* );
@@ -74,7 +75,6 @@ int bText=0;
 
 %option yylineno
 %option never-interactive
-%option nounistd
 
 %p 24000
 %e 1200