diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-12-22 11:46:04 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-12-22 11:47:54 (GMT) |
| commit | 310455cc188c52373637f984b99017884e802e8a (patch) | |
| tree | 94cef4d1347d93f3e7b67be6f1acc25b9c0d1b2d | |
| parent | 0d3b89ed7634598ef446da6b279f79b8bce20dd2 (diff) | |
| download | CMake-310455cc188c52373637f984b99017884e802e8a.zip CMake-310455cc188c52373637f984b99017884e802e8a.tar.gz CMake-310455cc188c52373637f984b99017884e802e8a.tar.bz2 | |
Fix some warnings from -Wundef
Other warnings come from kwsys, so the flag can't be enabled.
| -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())) { |