Mercurial > mplayer.hg
diff mencoder.c @ 27727:48c1ae64255b
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
This avoids a pointless indirection that only obscures what is really done.
| author | diego |
|---|---|
| date | Mon, 13 Oct 2008 16:23:55 +0000 |
| parents | 4876c89bafdd |
| children | 3ac3d3a51934 |
line wrap: on
line diff
--- a/mencoder.c Mon Oct 13 16:06:15 2008 +0000 +++ b/mencoder.c Mon Oct 13 16:23:55 2008 +0000 @@ -30,7 +30,7 @@ #define SIGQUIT 3 #define SIGPIPE 13 #endif -#ifdef WIN32 +#if defined(__MINGW32__) || defined(__CYGWIN__) #include <windows.h> #endif @@ -143,7 +143,7 @@ double cur_vout_time_usage=0; int benchmark=0; -#ifdef WIN32 +#if defined(__MINGW32__) || defined(__CYGWIN__) char * proc_priority=NULL; #endif @@ -456,9 +456,9 @@ #endif #endif -#if defined(WIN32) && defined(CONFIG_WIN32DLL) +#if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_WIN32DLL) set_path_env(); -#endif /*WIN32 && CONFIG_WIN32DLL*/ +#endif InitTimer(); @@ -516,7 +516,7 @@ } } -#ifdef WIN32 +#if defined(__MINGW32__) || defined(__CYGWIN__) if(proc_priority){ int i; for(i=0; priority_presets_defs[i].name; i++){