diff options
| author | Brad King <brad.king@kitware.com> | 2013-01-31 14:58:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-01-31 14:58:50 (GMT) |
| commit | 118c32f8f211b0bb9a096fbb0711cacf2b68f057 (patch) | |
| tree | d72f1f0bc3aeea7ab9c95f130f7de435fc2cf262 /Source/cmCommandArgumentParser.cxx | |
| parent | cf8645e82dbb7dff434b14bd127c5457745e4db8 (diff) | |
| parent | f447db7f102519e09258f0bd06668a9ae572ec68 (diff) | |
| download | CMake-118c32f8f211b0bb9a096fbb0711cacf2b68f057.zip CMake-118c32f8f211b0bb9a096fbb0711cacf2b68f057.tar.gz CMake-118c32f8f211b0bb9a096fbb0711cacf2b68f057.tar.bz2 | |
Merge branch 'xcode-duplicate-flags-13354' into generator-toolset
Diffstat (limited to 'Source/cmCommandArgumentParser.cxx')
| -rw-r--r-- | Source/cmCommandArgumentParser.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmCommandArgumentParser.cxx b/Source/cmCommandArgumentParser.cxx index 696a6a8..c5146c5 100644 --- a/Source/cmCommandArgumentParser.cxx +++ b/Source/cmCommandArgumentParser.cxx @@ -279,7 +279,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) @@ -701,7 +701,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ |