[matroska] r1134 - trunk/libebml/ebml

Author: mosu
Date: 2005-04-14 19:19:15 +0400 (Thu, 14 Apr 2005)
New Revision: 1134

Modified:
   trunk/libebml/ebml/EbmlConfig.h
   trunk/libebml/ebml/EbmlCrc32.h
Log:
Fixes for compilation with gcc 4 on 64 bit platforms (AMD64). Patch by Stefan Seyfried <seife () gmane0305 ! slipkontur ! de>

Modified: trunk/libebml/ebml/EbmlConfig.h
===================================================================
--- trunk/libebml/ebml/EbmlConfig.h	2005-04-12 19:00:20 UTC (rev 1133)
+++ trunk/libebml/ebml/EbmlConfig.h	2005-04-14 15:19:15 UTC (rev 1134)
@@ -38,7 +38,7 @@
 
 // automatic endianess detection working on GCC
 #if !defined(WORDS_BIGENDIAN)
-#if (defined (__arm__) && ! defined (__ARMEB__)) || defined (__i386__) || defined (__i860__) || defined (__ns32000__) || defined (__vax__) || defined (__amd64__)
+#if (defined (__arm__) && ! defined (__ARMEB__)) || defined (__i386__) || defined (__i860__) || defined (__ns32000__) || defined (__vax__) || defined (__amd64__) || defined (__x86_64__)
 #define WORDS_BIGENDIAN 0
 #elif defined (__sparc__) || defined (__alpha__) || defined (__PPC__) || defined (__mips__) || defined (__ppc__) || defined (__BIG_ENDIAN__)
 #define WORDS_BIGENDIAN 1

Modified: trunk/libebml/ebml/EbmlCrc32.h
===================================================================
--- trunk/libebml/ebml/EbmlCrc32.h	2005-04-12 19:00:20 UTC (rev 1133)
+++ trunk/libebml/ebml/EbmlCrc32.h	2005-04-14 15:19:15 UTC (rev 1134)
@@ -143,7 +143,7 @@
 
 inline bool IsAlignedOn(const void *p, unsigned int alignment)
 {
-	return IsPowerOf2(alignment) ? ModPowerOf2((unsigned int)p, alignment) == 0 : (unsigned int)p % alignment == 0;
+	return IsPowerOf2(alignment) ? ModPowerOf2((unsigned long)p, alignment) == 0 : (unsigned long)p % alignment == 0;
 }
 
 template <class T>