Import Geant4 10.3.0.beta source tree

source/externals/zlib/History

@@ -20,6 +20,14 @@ committal in the CVS repository !
 History file for G4 zlib package
 --------------------------------
 
+19 April 2015 Gunter Folger   (zlib-V10-02-01)
+-  fix in gzguts.h for Windows; as of Studio 2015 in 64 bit compilation,
+    _snprintf is no longer provided, but snprintf finally is available. 
+
+15 January 2015Gunter Folger   (zlib-V10-02-00)
+-  fix clang compiler warning in inflate.cc: return explicit value 
+     of -1L << 16 (0xffffFFFFffff000L)
+	  
 10 July 2015 Gunter Folger  (zlib-V10-01-01)
 -  Add type casts to fix windows compilations errors.
 

source/externals/zlib/src/gzguts.h

@@ -99,7 +99,7 @@
    Microsoft more than a decade later!), _snprintf does not guarantee null
    termination of the result -- however this is only used in gzlib.c where
    the result is assured to fit in the space provided */
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #  define snprintf _snprintf
 #endif
 

source/externals/zlib/src/inflate.cc

@@ -1465,7 +1465,8 @@ long ZEXPORT inflateMark(z_streamp strm)
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
+    if (strm == Z_NULL || strm->state == Z_NULL) return 0xffffFFFFffff0000L; // shut off clang
+	                                                                         // warning from -1L << 16;
     state = (struct inflate_state FAR *)strm->state;
     return ((long)(state->back) << 16) +
         (state->mode == COPY ? state->length :