diff options
| author | Brad King <brad.king@kitware.com> | 2013-01-03 18:53:05 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-01-03 18:53:05 (GMT) |
| commit | 3475f51f57e1fcc7bda3bf2b25c71f419e86c698 (patch) | |
| tree | b79f159cf74888aac242b399a597065879be6bb1 | |
| parent | 62078eacd0b58d38441b63b6f1f137ad4ef8042a (diff) | |
| parent | 310455cc188c52373637f984b99017884e802e8a (diff) | |
| download | CMake-3475f51f57e1fcc7bda3bf2b25c71f419e86c698.zip CMake-3475f51f57e1fcc7bda3bf2b25c71f419e86c698.tar.gz CMake-3475f51f57e1fcc7bda3bf2b25c71f419e86c698.tar.bz2 | |
Merge topic 'fix-undef-warnings'
310455c Fix some warnings from -Wundef
| -rw-r--r-- | Source/cmCommandArgumentParser.cxx | 4 | ||||
| -rw-r--r-- | Source/cmake.cxx | 2 |
2 files changed, 3 insertions, 3 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, \ diff --git a/Source/cmake.cxx b/Source/cmake.cxx index fba4860..a44c825 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -953,7 +953,7 @@ int cmake::AddCMakePaths() cMakeSelf = cmSystemTools::GetRealPath(cMakeSelf.c_str()); cMakeSelf += "/cmake"; cMakeSelf += cmSystemTools::GetExecutableExtension(); -#if __APPLE__ +#ifdef __APPLE__ // on the apple this might be the gui bundle if(!cmSystemTools::FileExists(cMakeSelf.c_str())) { |