rpms/chmlib/devel chmlib-chm_lib-fix_for_multiarch.diff, NONE, 1.1 chmlib-chm_lib_c-ppc-patch.diff, 1.2, NONE

[Peter Lemenkov (peter)]

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32703/devel

Added Files:
	chmlib-chm_lib-fix_for_multiarch.diff 
Removed Files:
	chmlib-chm_lib_c-ppc-patch.diff 
Log Message:
Better fix for multi-arch. Changed license header according to the Fedora's policy

chmlib-chm_lib-fix_for_multiarch.diff:

--- NEW FILE chmlib-chm_lib-fix_for_multiarch.diff ---
--- src/chm_lib.c	2007-08-05 09:03:27.000000000 +0400
+++ src/chm_lib.c	2007-08-05 09:07:04.000000000 +0400
@@ -148,35 +148,15 @@
 typedef unsigned __int32        UInt32;
 typedef __int64                 Int64;
 typedef unsigned __int64        UInt64;
-
-/* I386, 32-bit, non-Windows */
-/* Sparc        */
-/* MIPS         */
-/* PPC          */
-#elif __i386__ || __sun || __sgi || __ppc__
-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;
-
-/* x86-64 */
-/* Note that these may be appropriate for other 64-bit machines. */
-#elif __x86_64__ || __ia64__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef int                     Int32;
-typedef unsigned int            UInt32;
-typedef long                    Int64;
-typedef unsigned long           UInt64;
-
 #else
-
-/* yielding an error is preferable to yielding incorrect behavior */
-#error "Please define the sized types for your platform in chm_lib.c"
+#include <stdint.h>
+typedef uint8_t UChar;
+typedef int16_t Int16;
+typedef uint16_t UInt16;
+typedef int32_t Int32;
+typedef uint32_t UInt32;
+typedef int64_t Int64;
+typedef uint64_t UInt64;
 #endif
 
 /* GCC */


--- chmlib-chm_lib_c-ppc-patch.diff DELETED ---