diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-13 16:23:55 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-13 16:23:55 +0000 |
| commit | 4d644f513c841eaf4617edffb348338a798d37be (patch) | |
| tree | 2c89ad5e6bd82b9f8a97170d547d4988bae78fe3 /mencoder.c | |
| parent | 8322f0aef1f97a0b6377fca57ee5131b143e67f6 (diff) | |
| download | mpv-4d644f513c841eaf4617edffb348338a798d37be.tar.bz2 mpv-4d644f513c841eaf4617edffb348338a798d37be.tar.xz | |
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
This avoids a pointless indirection that only obscures what is really done.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27761 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mencoder.c b/mencoder.c index 6ddf5e07e1..bc378673f2 100644 --- a/mencoder.c +++ b/mencoder.c @@ -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_video_time_usage=0; 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 @@ user_correct_pts = 0; #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 @@ if (frameno_filename) { } } -#ifdef WIN32 +#if defined(__MINGW32__) || defined(__CYGWIN__) if(proc_priority){ int i; for(i=0; priority_presets_defs[i].name; i++){ |