summaryrefslogtreecommitdiff
path: root/package/mplayer/patches/patch-loader_win32_c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-04-04 10:34:02 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-04-04 10:34:02 +0200
commit5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch)
treecd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/mplayer/patches/patch-loader_win32_c
parent401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff)
parent4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts: BUGS package/autoconf/Makefile
Diffstat (limited to 'package/mplayer/patches/patch-loader_win32_c')
-rw-r--r--package/mplayer/patches/patch-loader_win32_c9
1 files changed, 4 insertions, 5 deletions
diff --git a/package/mplayer/patches/patch-loader_win32_c b/package/mplayer/patches/patch-loader_win32_c
index e5537e02a..9392be1ce 100644
--- a/package/mplayer/patches/patch-loader_win32_c
+++ b/package/mplayer/patches/patch-loader_win32_c
@@ -1,10 +1,9 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- MPlayer-1.0rc2.orig/loader/win32.c 2007-10-07 21:49:32.000000000 +0200
-+++ MPlayer-1.0rc2/loader/win32.c 2008-10-28 15:29:47.000000000 +0100
-@@ -63,7 +63,6 @@ for DLL to know too much about its envir
- #include <sys/types.h>
+--- mplayer-1.0-29973.orig/loader/win32.c 2009-12-02 19:45:33.000000000 +0100
++++ mplayer-1.0-29973/loader/win32.c 2009-12-04 22:32:05.000000000 +0100
+@@ -61,7 +61,6 @@ for DLL to know too much about its envir
#include <dirent.h>
#include <sys/time.h>
+ #include <sys/stat.h>
-#include <sys/timeb.h>
#ifdef HAVE_KSTAT
#include <kstat.h>