From 3597bae6c766c0957f9514fd57a3736aa960094c Mon Sep 17 00:00:00 2001 From: "briano%netscape.com" Date: Thu, 26 Aug 1999 00:10:19 +0000 Subject: [PATCH] Replaced the NETSCAPE ifdefs with MOZILLA_CLIENT to reduce the number of macros we have to define. --- modules/zlib/src/gzio.c | 16 ++++++------- modules/zlib/src/zconf.h | 4 ++-- modules/zlib/src/zlib.h | 50 ++++++++++++++++++++-------------------- modules/zlib/src/zutil.h | 4 ++-- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/modules/zlib/src/gzio.c b/modules/zlib/src/gzio.c index 0acfe6d600d..770871a8e0d 100644 --- a/modules/zlib/src/gzio.c +++ b/modules/zlib/src/gzio.c @@ -4,7 +4,7 @@ */ /* This file was modified since it was taken from the zlib distribution */ -/* $Id: gzio.c,v 3.1 1998-03-28 03:36:11 ltabb Exp $ */ +/* $Id: gzio.c,v 3.2 1999-08-26 00:10:17 briano%netscape.com Exp $ */ #include @@ -146,7 +146,7 @@ local gzFile gz_open (path, mode, fd) /* =========================================================================== Opens a gzip (.gz) file for reading or writing. */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern gzFile) gzopen (const char *path, const char *mode) #else extern gzFile EXPORT gzopen OF((const char *path, const char *mode)) @@ -159,7 +159,7 @@ extern gzFile EXPORT gzopen OF((const char *path, const char *mode)) Associate a gzFile with the file descriptor fd. fd is not dup'ed here to mimic the behavio(u)r of fdopen. */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern gzFile) gzdopen (int fd, const char *mode) #else extern gzFile EXPORT gzdopen OF((int fd, const char *mode)) @@ -287,7 +287,7 @@ local int destroy (s) Reads the given number of uncompressed bytes from the compressed file. gzread returns the number of bytes actually read (0 for end of file). */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) gzread (gzFile file, voidp buf, unsigned len) #else extern int EXPORT gzread OF((gzFile file, voidp buf, unsigned len)) @@ -367,7 +367,7 @@ extern int EXPORT gzread OF((gzFile file, voidp buf, unsigned len)) Writes the given number of uncompressed bytes into the compressed file. gzwrite returns the number of bytes actually written (0 in case of error). */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) gzwrite (gzFile file, const voidp buf, unsigned len) #else extern int EXPORT gzwrite OF((gzFile file, const voidp buf, unsigned len)) @@ -405,7 +405,7 @@ extern int EXPORT gzwrite OF((gzFile file, const voidp buf, unsigned len)) gzflush should be called only when strictly necessary because it can degrade compression. */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) gzflush (gzFile file, int flush) #else extern int EXPORT gzflush OF((gzFile file, int flush)) @@ -479,7 +479,7 @@ local uLong getLong (s) Flushes all pending output if necessary, closes the compressed file and deallocates all the (de)compression state. */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) gzclose (gzFile file) #else extern int EXPORT gzclose OF((gzFile file)) @@ -508,7 +508,7 @@ extern int EXPORT gzclose OF((gzFile file)) errnum is set to Z_ERRNO and the application may consult errno to get the exact error code. */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern const char *) gzerror (gzFile file, int *errnum) #else extern const char * EXPORT gzerror OF((gzFile file, int *errnum)) diff --git a/modules/zlib/src/zconf.h b/modules/zlib/src/zconf.h index 64ac972ce0b..a179b76f5d5 100644 --- a/modules/zlib/src/zconf.h +++ b/modules/zlib/src/zconf.h @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ /* This file was modified since it was taken from the zlib distribution */ -/* $Id: zconf.h,v 3.1 1998-03-28 03:36:16 ltabb Exp $ */ +/* $Id: zconf.h,v 3.2 1999-08-26 00:10:18 briano%netscape.com Exp $ */ #ifndef _ZCONF_H #define _ZCONF_H @@ -172,7 +172,7 @@ typedef uLong FAR uLongf; typedef Byte *voidp; #endif -#ifndef NETSCAPE +#ifndef MOZILLA_CLIENT /* Compile with -DZLIB_DLL for Windows DLL support */ #if (defined(_WINDOWS) || defined(WINDOWS)) && defined(ZLIB_DLL) # include diff --git a/modules/zlib/src/zlib.h b/modules/zlib/src/zlib.h index 88a86a11ebf..b216f00a3cc 100644 --- a/modules/zlib/src/zlib.h +++ b/modules/zlib/src/zlib.h @@ -169,7 +169,7 @@ typedef z_stream FAR *z_streamp; /* basic functions */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern const char *) zlibVersion (void); #else extern const char * EXPORT zlibVersion OF((void)); @@ -203,7 +203,7 @@ extern int EXPORT deflateInit OF((z_streamp strm, int level)); */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) deflate (z_streamp strm, int flush); #else extern int EXPORT deflate OF((z_streamp strm, int flush)); @@ -276,7 +276,7 @@ extern int EXPORT deflate OF((z_streamp strm, int flush)); */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) deflateEnd (z_streamp strm); #else extern int EXPORT deflateEnd OF((z_streamp strm)); @@ -310,7 +310,7 @@ extern int EXPORT inflateInit OF((z_streamp strm)); */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) inflate (z_streamp strm, int flush); #else extern int EXPORT inflate OF((z_streamp strm, int flush)); @@ -369,7 +369,7 @@ extern int EXPORT inflate OF((z_streamp strm, int flush)); */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) inflateEnd (z_streamp strm); #else extern int EXPORT inflateEnd OF((z_streamp strm)); @@ -449,7 +449,7 @@ extern int EXPORT deflateInit2 OF((z_streamp strm, deflate(). */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) deflateSetDictionary (z_streamp strm, const Bytef *dictionary, uInt dictLength); @@ -484,7 +484,7 @@ extern int EXPORT deflateSetDictionary OF((z_streamp strm, be done by deflate(). */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) deflateCopy (z_streamp dest, z_streamp source); #else extern int EXPORT deflateCopy OF((z_streamp dest, z_streamp source)); @@ -510,7 +510,7 @@ extern int EXPORT deflateCopy OF((z_streamp dest, z_streamp source)); destination. */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) deflateReset (z_streamp strm); #else extern int EXPORT deflateReset OF((z_streamp strm)); @@ -525,7 +525,7 @@ extern int EXPORT deflateReset OF((z_streamp strm)); stream state was inconsistent (such as zalloc or state being NULL). */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) deflateParams (z_streamp strm, int level, int strategy); #else extern int EXPORT deflateParams OF((z_streamp strm, int level, int strategy)); @@ -582,7 +582,7 @@ extern int EXPORT inflateInit2 OF((z_streamp strm, inflate(). */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) inflateSetDictionary (z_streamp strm, const Bytef *dictionary, uInt dictLength); @@ -607,7 +607,7 @@ extern int EXPORT inflateSetDictionary OF((z_streamp strm, inflate(). */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) inflateSync (z_streamp strm); #else extern int EXPORT inflateSync OF((z_streamp strm)); @@ -626,7 +626,7 @@ extern int EXPORT inflateSync OF((z_streamp strm)); until success or end of the input data. */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) inflateReset (z_streamp strm); #else extern int EXPORT inflateReset OF((z_streamp strm)); @@ -651,7 +651,7 @@ extern int EXPORT inflateReset OF((z_streamp strm)); utility functions can easily be modified if you need special options. */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) compress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen); #else @@ -671,7 +671,7 @@ extern int EXPORT compress OF((Bytef *dest, uLongf *destLen, buffer. */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) uncompress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen); #else @@ -697,7 +697,7 @@ extern int EXPORT uncompress OF((Bytef *dest, uLongf *destLen, typedef voidp gzFile; -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern gzFile) gzopen (const char *path, const char *mode); #else extern gzFile EXPORT gzopen OF((const char *path, const char *mode)); @@ -713,7 +713,7 @@ extern gzFile EXPORT gzopen OF((const char *path, const char *mode)); zlib error is Z_MEM_ERROR). */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern gzFile) gzdopen (int fd, const char *mode); #else extern gzFile EXPORT gzdopen OF((int fd, const char *mode)); @@ -730,7 +730,7 @@ extern gzFile EXPORT gzdopen OF((int fd, const char *mode)); the (de)compression state. */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) gzread (gzFile file, voidp buf, unsigned len); #else extern int EXPORT gzread OF((gzFile file, voidp buf, unsigned len)); @@ -742,7 +742,7 @@ extern int EXPORT gzread OF((gzFile file, voidp buf, unsigned len)); gzread returns the number of uncompressed bytes actually read (0 for end of file, -1 for error). */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) gzwrite (gzFile file, const voidp buf, unsigned len); #else extern int EXPORT gzwrite OF((gzFile file, const voidp buf, unsigned len)); @@ -753,7 +753,7 @@ extern int EXPORT gzwrite OF((gzFile file, const voidp buf, unsigned len)); (0 in case of error). */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) gzflush (gzFile file, int flush); #else extern int EXPORT gzflush OF((gzFile file, int flush)); @@ -767,7 +767,7 @@ extern int EXPORT gzflush OF((gzFile file, int flush)); degrade compression. */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) gzclose (gzFile file); #else extern int EXPORT gzclose OF((gzFile file)); @@ -778,7 +778,7 @@ extern int EXPORT gzclose OF((gzFile file)); error number (see function gzerror below). */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern const char *) gzerror (gzFile file, int *errnum); #else extern const char * EXPORT gzerror OF((gzFile file, int *errnum)); @@ -799,7 +799,7 @@ extern const char * EXPORT gzerror OF((gzFile file, int *errnum)); compression library. */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern uLong) adler32 (uLong adler, const Bytef *buf, uInt len); #else extern uLong EXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); @@ -820,7 +820,7 @@ extern uLong EXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); if (adler != original_adler) error(); */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern uLong) crc32 (uLong crc, const Bytef *buf, uInt len); #else extern uLong EXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); @@ -846,7 +846,7 @@ extern uLong EXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); /* deflateInit and inflateInit are macros to allow checking the zlib version * and the compiler's view of z_stream: */ -#ifdef NETSCAPE +#ifdef MOZILLA_CLIENT PR_PUBLIC_API(extern int) deflateInit_ (z_streamp strm, int level, const char *version, int stream_size); PR_PUBLIC_API(extern int) inflateInit_ (z_streamp strm, const char *version, @@ -866,7 +866,7 @@ extern int EXPORT deflateInit2_ OF((z_streamp strm, int level, int method, const char *version, int stream_size)); extern int EXPORT inflateInit2_ OF((z_streamp strm, int windowBits, const char *version, int stream_size)); -#endif /* NETSCAPE */ +#endif /* MOZILLA_CLIENT */ #define deflateInit(strm, level) \ diff --git a/modules/zlib/src/zutil.h b/modules/zlib/src/zutil.h index b7b12728358..5bf7bab5406 100644 --- a/modules/zlib/src/zutil.h +++ b/modules/zlib/src/zutil.h @@ -8,7 +8,7 @@ subject to change. Applications should only use zlib.h. */ -/* $Id: zutil.h,v 3.1 1998-03-28 03:36:18 ltabb Exp $ */ +/* $Id: zutil.h,v 3.2 1999-08-26 00:10:19 briano%netscape.com Exp $ */ #ifndef _Z_UTIL_H #define _Z_UTIL_H @@ -133,7 +133,7 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ /* functions */ #ifdef HAVE_STRERROR -#ifndef NETSCAPE +#ifndef MOZILLA_CLIENT extern char *strerror OF((int)); #endif # define zstrerror(errnum) strerror(errnum)