Mercurial > mplayer.hg
comparison mplayer.c @ 29642:0e6de6bc0eec
Merge two Windows-specific #if sections to simplify the condition.
author | reimar |
---|---|
date | Wed, 16 Sep 2009 18:09:48 +0000 |
parents | 52e00a25ab71 |
children | ecc719c6d7a9 |
comparison
equal
deleted
inserted
replaced
29641:52e00a25ab71 | 29642:0e6de6bc0eec |
---|---|
2588 } | 2588 } |
2589 } | 2589 } |
2590 | 2590 |
2591 print_version("MPlayer"); | 2591 print_version("MPlayer"); |
2592 | 2592 |
2593 #if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_GUI) | 2593 #if defined(__MINGW32__) || defined(__CYGWIN__) |
2594 #ifdef CONFIG_GUI | |
2594 void *runningmplayer = FindWindow("MPlayer GUI for Windows", "MPlayer for Windows"); | 2595 void *runningmplayer = FindWindow("MPlayer GUI for Windows", "MPlayer for Windows"); |
2595 if(runningmplayer && filename && use_gui){ | 2596 if(runningmplayer && filename && use_gui){ |
2596 COPYDATASTRUCT csData; | 2597 COPYDATASTRUCT csData; |
2597 char file[MAX_PATH]; | 2598 char file[MAX_PATH]; |
2598 char *filepart = filename; | 2599 char *filepart = filename; |
2603 SendMessage(runningmplayer, WM_COPYDATA, (WPARAM)runningmplayer, (LPARAM)&csData); | 2604 SendMessage(runningmplayer, WM_COPYDATA, (WPARAM)runningmplayer, (LPARAM)&csData); |
2604 } | 2605 } |
2605 } | 2606 } |
2606 #endif | 2607 #endif |
2607 | 2608 |
2608 #if defined(__MINGW32__) || defined(__CYGWIN__) | |
2609 { | 2609 { |
2610 HMODULE kernel32 = GetModuleHandle("Kernel32.dll"); | 2610 HMODULE kernel32 = GetModuleHandle("Kernel32.dll"); |
2611 BOOL WINAPI (*setDEP)(DWORD) = NULL; | 2611 BOOL WINAPI (*setDEP)(DWORD) = NULL; |
2612 if (kernel32) | 2612 if (kernel32) |
2613 setDEP = GetProcAddress(kernel32, "SetProcessDEPPolicy"); | 2613 setDEP = GetProcAddress(kernel32, "SetProcessDEPPolicy"); |