Merge pull request #277 from TimothyGu/emerg

Enable libnut/ffmpeg compilation on i686-pc-mingw32 again
pull/279/head
Tony Theodore 11 years ago
commit 52f1585d44

@ -54,5 +54,3 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
endef
$(PKG)_BUILD_i686-pc-mingw32 = $(subst --enable-libnut,--disable-libnut,$($(PKG)_BUILD))

@ -0,0 +1,12 @@
diff -Naur libnut-r681.orig/libnut/priv.h libnut-r681/libnut/priv.h
--- libnut-r681.orig/libnut/priv.h 2013-11-09 09:31:47.000000000 -0800
+++ libnut-r681/libnut/priv.h 2013-11-23 16:56:13.085645547 -0800
@@ -45,7 +45,7 @@
#define ABS(a) ((a) > 0 ? (a) : -(a))
#if (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR))
-#define ftello(a) ((off_t)(_ftelli64(a)))
+#define ftello(a) ((off_t)(ftello64(a)))
#endif
typedef struct {
Loading…
Cancel
Save