blob: 7a122713d2326ce296de67a48bdc97312dd63ec3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
--- misc/unzip.h.old 2011-09-23 19:53:09.708884325 +0200
+++ misc/unzip.h 2011-09-23 19:54:00.012878355 +0200
@@ -49,6 +49,10 @@
#include "zlib.h"
#endif
+#ifndef OF
+#define OF(x) x
+#endif
+
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
/* like the STRICT of WIN32, we define a pointer that cannot be converted
from (void*) without cast */
--- libdiscmage/unzip.h.old 2011-09-23 19:59:47.319837133 +0200
+++ libdiscmage/unzip.h 2011-09-23 20:00:07.230834769 +0200
@@ -48,6 +48,9 @@
#ifndef _ZLIB_H
#include "zlib.h"
#endif
+#ifndef OF
+#define OF(x) x
+#endif
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
/* like the STRICT of WIN32, we define a pointer that cannot be converted
--- libdiscmage/misc_z.c.old 2012-03-19 08:39:41.975022496 +0100
+++ libdiscmage/misc_z.c 2012-03-19 08:40:13.109803301 +0100
@@ -27,6 +27,7 @@
#include <string.h>
#include <errno.h>
#include <sys/stat.h>
+#define Z_SOLO
#include <zlib.h>
#include "misc_z.h"
#include "misc.h"
--- misc/archive.c.old 2012-03-19 08:41:06.478999810 +0100
+++ misc/archive.c 2012-03-19 08:41:24.134741668 +0100
@@ -27,6 +27,7 @@
#include <string.h>
#include <errno.h>
#include <sys/stat.h>
+#define Z_SOLO
#include <zlib.h>
#ifdef HAVE_BYTESWAP_H
#include <byteswap.h>
|
GitWeb
