Commit c36bcec8 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

libebml port to Win64

parent 0edc093c
...@@ -968,6 +968,9 @@ libebml: libebml-$(LIBEBML_VERSION).tar.bz2 ...@@ -968,6 +968,9 @@ libebml: libebml-$(LIBEBML_VERSION).tar.bz2
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch) (cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch)
endif endif
ifdef HAVE_WIN64
patch -p0 < Patches/libebml-win64.patch
endif
.ebml: libebml .ebml: libebml
ifdef HAVE_WIN32 ifdef HAVE_WIN32
......
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>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment