After discussion with Constantin reverted 2433, 2434, 2436, 2437 and 2438
(build automation and i18n changes). Latest server changes (2439 and 2440)
are OK.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2442 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/zlib/minigzip.c b/common/zlib/minigzip.c
index 4050878..8be02bd 100644
--- a/common/zlib/minigzip.c
+++ b/common/zlib/minigzip.c
@@ -15,10 +15,6 @@
/* @(#) $Id: minigzip.c,v 1.1 2004/10/08 09:44:26 const_k Exp $ */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include "zlib.h"
@@ -29,7 +25,7 @@
extern void exit OF((int));
#endif
-#ifdef HAVE_MMAP
+#ifdef USE_MMAP
# include <sys/types.h>
# include <sys/mman.h>
# include <sys/stat.h>
@@ -79,7 +75,7 @@
void error OF((const char *msg));
void gz_compress OF((FILE *in, gzFile out));
-#ifdef HAVE_MMAP
+#ifdef USE_MMAP
int gz_compress_mmap OF((FILE *in, gzFile out));
#endif
void gz_uncompress OF((gzFile in, FILE *out));
@@ -109,7 +105,7 @@
int len;
int err;
-#ifdef HAVE_MMAP
+#ifdef USE_MMAP
/* Try first compressing with mmap. If mmap fails (minigzip used in a
* pipe), use the normal fread loop.
*/
@@ -129,7 +125,7 @@
if (gzclose(out) != Z_OK) error("failed gzclose");
}
-#ifdef HAVE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
+#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
/* Try compressing the input file at once using mmap. Return Z_OK if
* if success, Z_ERRNO otherwise.
@@ -164,7 +160,7 @@
if (gzclose(out) != Z_OK) error("failed gzclose");
return Z_OK;
}
-#endif /* HAVE_MMAP */
+#endif /* USE_MMAP */
/* ===========================================================================
* Uncompress input to output then close both files.