summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-08-18 14:26:53 +0200
committerStefan Metzmacher <metze@samba.org>2008-08-18 15:25:41 +0200
commit7474196d837eb6f9c8e6f26cd649cbb638fd34d8 (patch)
treeeae03dd187c2ef2568f4f3315546f5bd07b95c3f /source4
parent5e4f668468d83b09765c4b15ff1b40b88401fb00 (diff)
downloadsamba-7474196d837eb6f9c8e6f26cd649cbb638fd34d8.tar.gz
samba-7474196d837eb6f9c8e6f26cd649cbb638fd34d8.tar.bz2
samba-7474196d837eb6f9c8e6f26cd649cbb638fd34d8.zip
zlib: mark as modified for samba
metze (This used to be commit 0fb265e567d700b3c16eb8f28bc5f26653a819fa)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/zlib/zlib.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/source4/lib/zlib/zlib.h b/source4/lib/zlib/zlib.h
index 5549f9cf57..edf09d2b1e 100644
--- a/source4/lib/zlib/zlib.h
+++ b/source4/lib/zlib/zlib.h
@@ -37,8 +37,14 @@
extern "C" {
#endif
-#define ZLIB_VERSION "1.2.3"
-#define ZLIB_VERNUM 0x1230
+#define ZLIB_VERSION "1.2.3.1.Samba"
+#define ZLIB_VERNUM 0x1231
+/*
+ * Modified for Samba by Stefan Metzmacher <metze@samba.org> 2008
+ *
+ * inflateReset2() added and compiler warnings fixed
+ */
+
/*
The 'zlib' compression library provides in-memory compression and