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

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29684 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-09-16 18:09:48 +00:00
parent 1782e34b55
commit 4dae2a980c
1 changed files with 2 additions and 2 deletions

View File

@ -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;