diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-05-23 12:20:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-23 13:57:20 +0100 |
| commit | 2ae6f9d1d27f699a6dcf369ba018c93ea7d5def5 (patch) | |
| tree | 183cc1cc59beebd9294c02071ad429deb87afb01 | |
| parent | fd5a9f20ef7b68439820a385f4527ba94a5a0d03 (diff) | |
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
| -rw-r--r-- | connectivity/source/parse/sqlflex.l | 2 | ||||
| -rw-r--r-- | idlc/source/scanner.l | 2 | ||||
| -rw-r--r-- | l10ntools/source/cfglex.l | 2 | ||||
| -rw-r--r-- | l10ntools/source/srclex.l | 2 | ||||
| -rw-r--r-- | l10ntools/source/xrmlex.l | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index 166bbf6e9edb..0f7c3b5963a6 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 ca5119feed6f..51204b8ade46 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 a5c698881bfe..501debd9ee9d 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 0f2195539057..91742a11c2ff 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 7f28d3f68a7c..73e3babedfbb 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 |