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>
pull/68/head
John Peebles 11 years ago committed by Marton Balint
parent 1fab67b685
commit e11697759d
  1. 2
      cmdutils.h
  2. 2
      ffplay.c

@ -30,7 +30,7 @@
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#include "libswscale/swscale.h" #include "libswscale/swscale.h"
#ifdef __MINGW32__ #ifdef _WIN32
#undef main /* We don't want SDL to override our main() */ #undef main /* We don't want SDL to override our main() */
#endif #endif

@ -3635,7 +3635,7 @@ int main(int argc, char **argv)
flags &= ~SDL_INIT_AUDIO; flags &= ~SDL_INIT_AUDIO;
if (display_disable) if (display_disable)
SDL_putenv(dummy_videodriver); /* For the event queue, we always need a video driver. */ 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 */ flags |= SDL_INIT_EVENTTHREAD; /* Not supported on Windows or Mac OS X */
#endif #endif
if (SDL_Init (flags)) { if (SDL_Init (flags)) {

Loading…
Cancel
Save