Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Preparing for release of 2.6.9pre2
[rsync/rsync.git]
/
zlib
/
zconf.h
diff --git
a/zlib/zconf.h
b/zlib/zconf.h
index
3c21403
..
03a9431
100644
(file)
--- a/
zlib/zconf.h
+++ b/
zlib/zconf.h
@@
-1,5
+1,5
@@
/* zconf.h -- configuration of the zlib compression library
/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-200
4
Jean-loup Gailly.
+ * Copyright (C) 1995-200
5
Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
*/
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@
-43,6
+43,10
@@
# define get_crc_table z_get_crc_table
# define zError z_zError
# define get_crc_table z_get_crc_table
# define zError z_zError
+# define alloc_func z_alloc_func
+# define free_func z_free_func
+# define in_func z_in_func
+# define out_func z_out_func
# define Byte z_Byte
# define uInt z_uInt
# define uLong z_uLong
# define Byte z_Byte
# define uInt z_uInt
# define uLong z_uLong
@@
-64,8
+68,10
@@
#if defined(_WINDOWS) && !defined(WINDOWS)
# define WINDOWS
#endif
#if defined(_WINDOWS) && !defined(WINDOWS)
# define WINDOWS
#endif
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-# define WIN32
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+# ifndef WIN32
+# define WIN32
+# endif
#endif
#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
#endif
#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)