summaryrefslogtreecommitdiff
path: root/l10ntools
diff options
context:
space:
mode:
authorTerrence Enger <tenger@iseries-guru.com>2012-07-07 11:32:52 -0400
committerDavid Ostrovsky <David.Ostrovsky@gmx.de>2012-07-07 22:00:17 +0200
commitf2d484e8652a1d5ac406d0d3a6c527e9f75ef0f2 (patch)
tree6713816988032ea91dd4f5e42dd1f210ce9f1b56 /l10ntools
parent14a3ad2a23a14de57207e1fd3adc459684f95672 (diff)
"Wunused-but-set-variable" was new in gcc 4.6
Condition new #pragma by gcc version Change-Id: I0e5273c267e3514529de90d79cc221b44dbdcf9c
Diffstat (limited to 'l10ntools')
-rw-r--r--l10ntools/Executable_transex3.mk2
-rw-r--r--l10ntools/source/cfglex.l2
-rw-r--r--l10ntools/source/srclex.l6
-rw-r--r--l10ntools/source/xrmlex.l6
4 files changed, 12 insertions, 4 deletions
diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk
index e328769f618f..bc9a85272d9f 100644
--- a/l10ntools/Executable_transex3.mk
+++ b/l10ntools/Executable_transex3.mk
@@ -39,6 +39,8 @@ $(eval $(call gb_Executable_add_scanners,transex3,\
l10ntools/source/srclex \
))
+$(call gb_LexTarget_get_scanner_target,l10ntools/source/srclex) : T_LEXFLAGS := -w
+
$(eval $(call gb_Executable_use_static_libraries,transex3,\
transex \
))
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index dda0246ff909..7476cbff0eb7 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -27,6 +27,8 @@
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-label"
+#endif
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
#elif defined __SINPRO_CC
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 60017259503f..2fbd3f0e6278 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -28,6 +28,8 @@
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-label"
+#endif
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
#elif defined __SINPRO_CC
@@ -154,8 +156,8 @@ void YYWarning();
WorkOnTokenSet( TEXTREFID, yytext );
}
-[a-zA-Z0-9_]+[ \t]*"="[\t ]*([ \t]*"//".*\n)*.* |
-[a-zA-Z0-9_]+[ \t]*"=".* {
+[a-zA-Z0-9_]+[ \t]*"="[\t ]*([ \t]*"//".*\n)*.* |
+[a-zA-Z0-9_]+[ \t]*"=".* {
/* ASSIGNMENT Typ = ... */
WorkOnTokenSet( ASSIGNMENT, yytext );
}
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 5e00cc13cd2b..9e9aa5cb93ba 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -17,7 +17,7 @@
#endif
/* table of possible token ids */
-#include "tokens.h"
+#include "tokens.h"
#include <stdlib.h>
#include <stdio.h>
@@ -27,6 +27,8 @@
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-label"
+#endif
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
#elif defined __SINPRO_CC
@@ -154,7 +156,7 @@ int bText=0;
c2 = c3;
c3 = yyinput();
pChar[0] = c3;
- WorkOnTokenSet( COMMEND, pChar );
+ WorkOnTokenSet( COMMEND, pChar );
}
}