- release 2 for Th

[packages/chmlib.git] / chmlib-morearchs.patch

diff --git a/chmlib-morearchs.patch b/chmlib-morearchs.patch
index 36f3aaf7dc9e615bd0fe123685c60dabda8a6766..59a7bbdd9002ee27a8a997ebf466342d6187b370 100644 (file)
--- a/chmlib-morearchs.patch
+++ b/chmlib-morearchs.patch
@@ -1,11 +1,11 @@
---- chmlib-0.31/chm_lib.c.orig 2003-11-19 08:55:04.000000000 +0000
-+++ chmlib-0.31/chm_lib.c      2003-11-19 09:17:01.000000000 +0000
-@@ -142,14 +142,15 @@
- /* I386, 32-bit, non-Windows */
+--- chmlib-0.36/src/chm_lib.c.orig     2005-09-09 14:42:27.000000000 +0200
++++ chmlib-0.36/src/chm_lib.c  2005-09-19 14:26:33.000000000 +0200
+@@ -160,14 +160,15 @@
  /* Sparc        */
  /* MIPS         */
--#elif __i386__ || __sun || __sgi
-+#elif __i386__ || __sun || __sgi || __linux__
+ /* PPC          */
+-#elif __i386__ || __sun || __sgi || __ppc__
++#elif __i386__ || __sun || __sgi || __ppc__ || __linux__
 +#include <stdint.h>
  typedef unsigned char           UChar;
 -typedef short                   Int16;
@@ -20,33 +20,6 @@
 +typedef uint32_t                UInt32;
 +typedef int64_t                 Int64;
 +typedef uint64_t                UInt64;
- #else
  
- /* yielding an error is preferable to yielding incorrect behavior */
-@@ -1089,7 +1090,7 @@
-      *      that is provided for us.
-      */
-     struct chmPmglHeader header;
--    UInt32 hremain;
-+    unsigned long hremain;
-     UChar *end;
-     UChar *cur;
-     UChar *temp;
-@@ -1136,7 +1137,7 @@
-      *      that is provided for us
-      */
-     struct chmPmgiHeader header;
--    UInt32 hremain;
-+    unsigned long hremain;
-     int page=-1;
-     UChar *end;
-     UChar *cur;
-@@ -1244,7 +1245,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)
+ /* x86-64 */
+ /* Note that these may be appropriate for other 64-bit machines. */