[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] Check if YYENABLE_NLS is defined before checking its value
From: |
Jonathan Nieder |
Subject: |
[PATCH 1/2] Check if YYENABLE_NLS is defined before checking its value |
Date: |
Sat, 12 Dec 2009 15:43:18 -0600 |
User-agent: |
Mutt/1.5.20 (2009-06-14) |
Avoid warnings like this one when users compile parsers:
y.tab.c:383:6: warning: "YYENABLE_NLS" is not defined
It would not be sufficient to replace '#if YYENABLE_NLS' with
'#ifdef YYENABLE_NLS' because various projects currently define
YYENABLE_NLS to 0 to work around this warning.
---
data/glr.c | 2 +-
data/lalr1.cc | 2 +-
data/yacc.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/glr.c b/data/glr.c
index 6f1f7ee..89bbd6f 100644
--- a/data/glr.c
+++ b/data/glr.c
@@ -256,7 +256,7 @@ b4_percent_code_get[]dnl
#include <string.h>
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
diff --git a/data/lalr1.cc b/data/lalr1.cc
index 1a2777e..9e0d522 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -398,7 +398,7 @@ m4_if(b4_prefix, [yy], [],
b4_percent_code_get[]dnl
[#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* FIXME: INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
diff --git a/data/yacc.c b/data/yacc.c
index ea2ae14..af38314 100644
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -374,7 +374,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
--
1.6.5.4
- [PATCH 0/2] avoid some warnings from gcc -c -Wall -W y.tab.c, Jonathan Nieder, 2009/12/12
- [PATCH 1/2] Check if YYENABLE_NLS is defined before checking its value,
Jonathan Nieder <=
- [PATCH 3/2] Regenerate src/parse-gram.c, Jonathan Nieder, 2009/12/12
- [PATCH 2/2] Do not depend on YYLTYPE_IS_TRIVIAL unless locations are requested, Jonathan Nieder, 2009/12/12
- Re: several messages, Joel E. Denny, 2009/12/15
- Re: several messages, Jonathan Nieder, 2009/12/15
- Re: several messages, Joel E. Denny, 2009/12/15
- Re: several messages, Jonathan Nieder, 2009/12/15
- Re: several messages, Joel E. Denny, 2009/12/15
- Re: several messages, Jonathan Nieder, 2009/12/15
- Re: several messages, Joel E. Denny, 2009/12/15
- Re: several messages, Joel E. Denny, 2009/12/16