[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1308-g160ac43

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  160ac43582faf0563ef5e94b6eb94a9d013fb284 (commit)
       via  310455cc188c52373637f984b99017884e802e8a (commit)
      from  97755b45a1f2103d7c14103faa28e04231edad2b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=160ac43582faf0563ef5e94b6eb94a9d013fb284
commit 160ac43582faf0563ef5e94b6eb94a9d013fb284
Merge: 97755b4 310455c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Dec 22 06:48:48 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Dec 22 06:48:48 2012 -0500

    Merge topic 'fix-undef-warnings' into next
    
    310455c Fix some warnings from -Wundef


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=310455cc188c52373637f984b99017884e802e8a
commit 310455cc188c52373637f984b99017884e802e8a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Dec 22 12:46:04 2012 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Dec 22 12:47:54 2012 +0100

    Fix some warnings from -Wundef
    
    Other warnings come from kwsys, so the flag can't be enabled.

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()))
     {

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommandArgumentParser.cxx |    4 ++--
 Source/cmake.cxx                   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake