[Cmake-commits] CMake branch, master, updated. a18612429db86c23a40e5f96ce1de5425573779c

[cmake-commits at cmake.org]

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, master has been updated
       via  a18612429db86c23a40e5f96ce1de5425573779c (commit)
      from  e2c496e2af8e0f2bc0aaa62e91810482234a2157 (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=a18612429db86c23a40e5f96ce1de5425573779c
commit a18612429db86c23a40e5f96ce1de5425573779c
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date:   Tue May 4 14:51:12 2010 -0400

    Fixes for bug # 10543, build on older sunpro now works.

diff --git a/Utilities/cmlibarchive/libarchive/archive_endian.h b/Utilities/cmlibarchive/libarchive/archive_endian.h
index e374546..b7a5f96 100644
--- a/Utilities/cmlibarchive/libarchive/archive_endian.h
+++ b/Utilities/cmlibarchive/libarchive/archive_endian.h
@@ -43,9 +43,11 @@
  * Disabling inline keyword for compilers known to choke on it:
  * - Watcom C++ in C code.  (For any version?)
  * - SGI MIPSpro
+ * - SunPro C
  * - Microsoft Visual C++ 6.0 (supposedly newer versions too)
  */
-#if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__)
+#if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux)
+ || defined(__BORLANDC__) || defined(__SUNPRO_C)
 #define inline
 #elif defined(_MSC_VER)
 #define inline __inline
diff --git a/Utilities/cmzlib/deflate.c b/Utilities/cmzlib/deflate.c
index a5e7a35..5ec8374 100644
--- a/Utilities/cmzlib/deflate.c
+++ b/Utilities/cmzlib/deflate.c
@@ -286,10 +286,10 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 
     s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
 
-    // The following memset eliminates the valgrind uninitialized warning
-    // "swept under the carpet" here:
-    // http://www.zlib.net/zlib_faq.html#faq36
-    //
+    /* The following memset eliminates the valgrind uninitialized warning
+      "swept under the carpet" here:
+      http://www.zlib.net/zlib_faq.html#faq36 */
+
     memset(s->window, 0, s->w_size*2*sizeof(Byte));
 
     s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));

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

Summary of changes:
 Utilities/cmlibarchive/libarchive/archive_endian.h |    4 +++-
 Utilities/cmzlib/deflate.c                         |    8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake