From f6412b68566798eee344bc6c2d2ad583ae46b185 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 19 Nov 2003 09:37:19 +0000 Subject: [PATCH] - general support for more archs on Linux, some fixes for 64-bit long Changed files: archmage-morearchs.patch -> 1.1 --- archmage-morearchs.patch | 54 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 archmage-morearchs.patch diff --git a/archmage-morearchs.patch b/archmage-morearchs.patch new file mode 100644 index 0000000..dd4b294 --- /dev/null +++ b/archmage-morearchs.patch @@ -0,0 +1,54 @@ +--- archmage-0.0.6/chmlib/chm_lib.c.orig 2003-07-22 10:38:25.000000000 +0000 ++++ archmage-0.0.6/chmlib/chm_lib.c 2003-11-19 09:33:30.000000000 +0000 +@@ -484,7 +484,7 @@ + * that is provided for us. + */ + struct chmPmglHeader header; +- UInt32 hremain; ++ unsigned long hremain; + UChar *end; + UChar *cur; + UChar *temp; +@@ -531,7 +531,7 @@ + * that is provided for us + */ + struct chmPmgiHeader header; +- UInt32 hremain; ++ unsigned long hremain; + int page=-1; + UChar *end; + UChar *cur; +@@ -639,7 +639,7 @@ + Int64 *len) + { + UChar buffer[8], *dummy; +- UInt32 remain; ++ unsigned long remain; + + /* for all but the last block, use the reset table */ + if (block < h->reset_table.block_count-1) +--- archmage-0.0.6/chmlib/chm_lib.h.orig 2003-07-23 09:11:54.000000000 +0000 ++++ archmage-0.0.6/chmlib/chm_lib.h 2003-11-19 09:32:25.000000000 +0000 +@@ -139,14 +139,15 @@ + /* I386, 32-bit, non-Windows */ + /* Sparc */ + /* MIPS */ +-#elif __i386__ || __sun || __sgi ++#elif __i386__ || __sun || __sgi || __linux__ ++#include + typedef unsigned char UChar; +-typedef short Int16; +-typedef unsigned short UInt16; +-typedef long Int32; +-typedef unsigned long UInt32; +-typedef long long Int64; +-typedef unsigned long long UInt64; ++typedef int16_t Int16; ++typedef uint16_t UInt16; ++typedef int32_t Int32; ++typedef uint32_t UInt32; ++typedef int64_t Int64; ++typedef uint64_t UInt64; + #else + + /* yielding an error is preferable to yielding incorrect behavior */ -- 2.43.0