Mercurial > mplayer.hg
changeset 12358:133e0ebde74d
Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
| author | faust3 |
|---|---|
| date | Fri, 30 Apr 2004 16:56:00 +0000 |
| parents | 13e138957b7a |
| children | 2ee88c8d13ed |
| files | codec-cfg.h get_path.c mencoder.c mplayer.c |
| diffstat | 4 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/codec-cfg.h Fri Apr 30 10:40:30 2004 +0000 +++ b/codec-cfg.h Fri Apr 30 16:56:00 2004 +0000 @@ -27,7 +27,7 @@ #define CODECS_STATUS__MAX 2 -#ifndef GUID_TYPE +#if !defined(GUID_TYPE) && !defined(GUID_DEFINED) #define GUID_TYPE typedef struct { unsigned long f1;
--- a/get_path.c Fri Apr 30 10:40:30 2004 +0000 +++ b/get_path.c Fri Apr 30 16:56:00 2004 +0000 @@ -12,7 +12,6 @@ if ((homedir = getenv("HOME")) == NULL) #if defined(__MINGW32__)||defined(__CYGWIN__) /*hack to get fonts etc. loaded outside of cygwin environment*/ { - int __stdcall GetModuleFileNameA(void* hModule,char* lpFilename,int nSize); int i,imax=0; char exedir[260]; GetModuleFileNameA(NULL, exedir, 260);
--- a/mencoder.c Fri Apr 30 10:40:30 2004 +0000 +++ b/mencoder.c Fri Apr 30 16:56:00 2004 +0000 @@ -23,6 +23,10 @@ #ifdef __MINGW32__ #define SIGQUIT 3 #endif +#ifdef WIN32 +#include <windows.h> +#endif + #include <sys/time.h> #include "config.h"
--- a/mplayer.c Fri Apr 30 10:40:30 2004 +0000 +++ b/mplayer.c Fri Apr 30 16:56:00 2004 +0000 @@ -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 @@ 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);