diff options
| author | John Peebles <johnpeeb@gmail.com> | 2014-05-16 21:44:19 -0400 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2014-05-17 13:18:29 +0200 |
| commit | e11697759d06900195136df2be035d0d052316a1 (patch) | |
| tree | 2c11d3eb50fa1f8d001c2734a0a227383fc0f548 | |
| parent | 1fab67b6851f64778aa0ad9087e2d14f9ef1a798 (diff) | |
| download | ffmpeg-e11697759d06900195136df2be035d0d052316a1.tar.gz | |
cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC only defines _WIN32
With the previous patch, this should fix ticket #3580 as well.
Signed-off-by: John Peebles <johnpeeb@gmail.com>
| -rw-r--r-- | cmdutils.h | 2 | ||||
| -rw-r--r-- | ffplay.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmdutils.h b/cmdutils.h index 3fbaae93c2..c4a16aac73 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -30,7 +30,7 @@ #include "libavformat/avformat.h" #include "libswscale/swscale.h" -#ifdef __MINGW32__ +#ifdef _WIN32 #undef main /* We don't want SDL to override our main() */ #endif @@ -3635,7 +3635,7 @@ int main(int argc, char **argv) flags &= ~SDL_INIT_AUDIO; if (display_disable) SDL_putenv(dummy_videodriver); /* For the event queue, we always need a video driver. */ -#if !defined(__MINGW32__) && !defined(__APPLE__) +#if !defined(_WIN32) && !defined(__APPLE__) flags |= SDL_INIT_EVENTTHREAD; /* Not supported on Windows or Mac OS X */ #endif if (SDL_Init (flags)) { |