libebml port to Win64

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 59487e7c33abfb51461aa85f11906a01d9472015..4cc74b7ddd85b5486c6314ab9b17a445bb4defe4 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -968,6 +968,9 @@ libebml: libebml-$(LIBEBML_VERSION).tar.bz2
 ifdef HAVE_WIN32
        (cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch)
 endif
+ifdef HAVE_WIN64
+       patch -p0 < Patches/libebml-win64.patch
+endif
 
 .ebml: libebml
 ifdef HAVE_WIN32

diff --git a/extras/contrib/src/Patches/libebml-win64.patch b/extras/contrib/src/Patches/libebml-win64.patch
new file mode 100644 (file)
index 0000000..214f322
--- /dev/null
+++ b/extras/contrib/src/Patches/libebml-win64.patch
@@ -0,0 +1,12 @@
+diff -ruN libebml/ebml/EbmlCrc32.h libebml.new/ebml/EbmlCrc32.h
+--- libebml/ebml/EbmlCrc32.h   2005-05-06 13:43:38.000000000 +0200
++++ libebml.new/ebml/EbmlCrc32.h       2009-08-18 11:58:45.000000000 +0200
+@@ -143,7 +143,7 @@
+
+ inline bool IsAlignedOn(const void *p, unsigned int alignment)
+ {
+-      return IsPowerOf2(alignment) ? ModPowerOf2((unsigned long)p, alignment) == 0 : (unsigned long)p % alignment == 0;
++      return IsPowerOf2(alignment) ? ModPowerOf2((uintptr_t)p, alignment) == 0 : (uintptr_t)p % alignment == 0;
+ }
+
+ template <class T>