[MPlayer-cvslog] r29684 - trunk/mplayer.c

[reimar]

Author: reimar
Date: Wed Sep 16 20:09:48 2009
New Revision: 29684

Log:
Merge two Windows-specific #if sections to simplify the condition.

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Wed Sep 16 20:07:19 2009	(r29683)
+++ trunk/mplayer.c	Wed Sep 16 20:09:48 2009	(r29684)
@@ -2590,7 +2590,8 @@ int gui_no_filename=0;
 
   print_version("MPlayer");
 
-#if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_GUI)
+#if defined(__MINGW32__) || defined(__CYGWIN__)
+#ifdef CONFIG_GUI
     void *runningmplayer = FindWindow("MPlayer GUI for Windows", "MPlayer for Windows");
     if(runningmplayer && filename && use_gui){
         COPYDATASTRUCT csData;
@@ -2605,7 +2606,6 @@ int gui_no_filename=0;
     }
 #endif
 
-#if defined(__MINGW32__) || defined(__CYGWIN__)
 	{
 		HMODULE kernel32 = GetModuleHandle("Kernel32.dll");
 		BOOL WINAPI (*setDEP)(DWORD) = NULL;