]>
Commit | Line | Data |
---|---|---|
f6412b68 JB |
1 | --- archmage-0.0.6/chmlib/chm_lib.c.orig 2003-07-22 10:38:25.000000000 +0000 |
2 | +++ archmage-0.0.6/chmlib/chm_lib.c 2003-11-19 09:33:30.000000000 +0000 | |
3 | @@ -484,7 +484,7 @@ | |
4 | * that is provided for us. | |
5 | */ | |
6 | struct chmPmglHeader header; | |
7 | - UInt32 hremain; | |
8 | + unsigned long hremain; | |
9 | UChar *end; | |
10 | UChar *cur; | |
11 | UChar *temp; | |
12 | @@ -531,7 +531,7 @@ | |
13 | * that is provided for us | |
14 | */ | |
15 | struct chmPmgiHeader header; | |
16 | - UInt32 hremain; | |
17 | + unsigned long hremain; | |
18 | int page=-1; | |
19 | UChar *end; | |
20 | UChar *cur; | |
21 | @@ -639,7 +639,7 @@ | |
22 | Int64 *len) | |
23 | { | |
24 | UChar buffer[8], *dummy; | |
25 | - UInt32 remain; | |
26 | + unsigned long remain; | |
27 | ||
28 | /* for all but the last block, use the reset table */ | |
29 | if (block < h->reset_table.block_count-1) | |
30 | --- archmage-0.0.6/chmlib/chm_lib.h.orig 2003-07-23 09:11:54.000000000 +0000 | |
31 | +++ archmage-0.0.6/chmlib/chm_lib.h 2003-11-19 09:32:25.000000000 +0000 | |
32 | @@ -139,14 +139,15 @@ | |
33 | /* I386, 32-bit, non-Windows */ | |
34 | /* Sparc */ | |
35 | /* MIPS */ | |
36 | -#elif __i386__ || __sun || __sgi | |
37 | +#elif __i386__ || __sun || __sgi || __linux__ | |
38 | +#include <stdint.h> | |
39 | typedef unsigned char UChar; | |
40 | -typedef short Int16; | |
41 | -typedef unsigned short UInt16; | |
42 | -typedef long Int32; | |
43 | -typedef unsigned long UInt32; | |
44 | -typedef long long Int64; | |
45 | -typedef unsigned long long UInt64; | |
46 | +typedef int16_t Int16; | |
47 | +typedef uint16_t UInt16; | |
48 | +typedef int32_t Int32; | |
49 | +typedef uint32_t UInt32; | |
50 | +typedef int64_t Int64; | |
51 | +typedef uint64_t UInt64; | |
52 | #else | |
53 | ||
54 | /* yielding an error is preferable to yielding incorrect behavior */ |