Rename function z_errmsg to z_ROOT_errmsg to avoid a conflict on MacOS

with other packages also using gzip (geant4 or ROOT freetype)


git-svn-id: http://root.cern.ch/svn/root/trunk@9229 27541ba8-7e3a-0410-8455-c3a389f83636

zip/inc/zutil.h

@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id$ */
+/* @(#) $Id: zutil.h,v 1.1 2004/03/17 17:34:01 brun Exp $ */
 
 #ifndef ZUTIL_H
 #define ZUTIL_H
@@ -37,11 +37,11 @@ typedef uch FAR uchf;
 typedef unsigned short ush;
 typedef ush FAR ushf;
 typedef unsigned long  ulg;
-
-extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+/* THE ORIGINAL z_errmsg renamed to z_ROOT_errmsg to avoid a load conflict on MacOS */
+extern const char * const z_ROOT_errmsg[10]; /* indexed by 2-zlib_error */
 /* (size given to avoid silly warnings with Visual C++) */
 
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+#define ERR_MSG(err) z_ROOT_errmsg[Z_NEED_DICT-(err)]
 
 #define ERR_RETURN(strm,err) \
   return (strm->msg = (char*)ERR_MSG(err), (err))

zip/src/zutil.c

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id$ */
+/* @(#) $Id: zutil.c,v 1.1 2004/03/17 17:34:01 brun Exp $ */
 
 #include "zutil.h"
 
@@ -15,7 +15,7 @@ struct internal_state      {int dummy;}; /* for buggy compilers */
 extern void exit OF((int));
 #endif
 
-const char * const z_errmsg[10] = {
+const char * const z_ROOT_errmsg[10] = {
 "need dictionary",     /* Z_NEED_DICT       2  */
 "stream end",          /* Z_STREAM_END      1  */
 "",                    /* Z_OK              0  */