diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-16 18:09:48 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-16 18:09:48 +0000 |
commit | 4dae2a980c4313deed6ddb69556d2ead4417119c (patch) | |
tree | ad4d225209c319d5a9e1d7a368f8ab1848ec1f9f | |
parent | 1782e34b55f8f0fdb3504ee05a2ec94b7aae73e1 (diff) | |
download | mpv-4dae2a980c4313deed6ddb69556d2ead4417119c.tar.bz2 mpv-4dae2a980c4313deed6ddb69556d2ead4417119c.tar.xz |
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
-rw-r--r-- | mplayer.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; |