summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-30 16:56:00 +0000
committerfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-30 16:56:00 +0000
commit0af4151b05184e1da37abdfc88204a322339ff8a (patch)
tree27cc3606021de6adefeb1d8c7ae2192807cfdeeb /mplayer.c
parentbd4e50d10b6e9ba8c0a1c86845802c7735ce1633 (diff)
downloadmpv-0af4151b05184e1da37abdfc88204a322339ff8a.tar.bz2
mpv-0af4151b05184e1da37abdfc88204a322339ff8a.tar.xz
Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12359 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index b9f9c60286..88d8b16401 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1,5 +1,9 @@
#include <stdio.h>
#include <stdlib.h>
+#ifdef WIN32
+#define _UWIN 1 /*disable Non-underscored versions of non-ANSI functions as otherwise int eof would conflict with eof()*/
+#include <windows.h>
+#endif
#include <string.h>
#include <unistd.h>
@@ -792,8 +796,6 @@ int gui_no_filename=0;
char tmppath[MAX_PATH*2 + 1];
char win32path[MAX_PATH];
char realpath[MAX_PATH];
- int WINAPI SetEnvironmentVariableA(char*,char*);
- int WINAPI GetModuleFileNameA(void*,char*,int);
#ifdef __CYGWIN__
cygwin_conv_to_full_win32_path(WIN32_PATH,win32path);
strcpy(tmppath,win32path);