diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2010-05-04 14:51:12 -0400 |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2010-05-04 14:52:22 -0400 |
| commit | a18612429db86c23a40e5f96ce1de5425573779c (patch) | |
| tree | 6f85f091537b91c6674981b3735844994e8b93b0 | |
| parent | e2c496e2af8e0f2bc0aaa62e91810482234a2157 (diff) | |
| download | cmake-a18612429db86c23a40e5f96ce1de5425573779c.tar.gz | |
Fixes for bug # 10543, build on older sunpro now works.
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_endian.h | 4 | ||||
| -rw-r--r-- | Utilities/cmzlib/deflate.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_endian.h b/Utilities/cmlibarchive/libarchive/archive_endian.h index e374546032..b7a5f96317 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 a5e7a358fc..5ec8374331 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)); |