Mercurial > mplayer.hg

changeset 29642:0e6de6bc0eec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge two Windows-specific #if sections to simplify the condition.
author reimar
date Wed, 16 Sep 2009 18:09:48 +0000
parents 52e00a25ab71
children c2b0efdf5358
files mplayer.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Wed Sep 16 18:07:19 2009 +0000
+++ b/mplayer.c	Wed Sep 16 18:09:48 2009 +0000
@@ -2590,7 +2590,8 @@
 
   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 @@
     }
 #endif
 
-#if defined(__MINGW32__) || defined(__CYGWIN__)
 	{
 		HMODULE kernel32 = GetModuleHandle("Kernel32.dll");
 		BOOL WINAPI (*setDEP)(DWORD) = NULL;