Mercurial > mplayer.hg
changeset 32386:ce1c7ac2e3d4
Simplify some ifdefs.
| author | reimar |
|---|---|
| date | Sat, 09 Oct 2010 15:16:24 +0000 |
| parents | 8d841a288ca7 |
| children | 8317ee61e0b0 |
| files | mpcommon.c |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mpcommon.c Sat Oct 09 15:14:33 2010 +0000 +++ b/mpcommon.c Sat Oct 09 15:16:24 2010 +0000 @@ -393,10 +393,10 @@ */ int common_init(void) { -#if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_WIN32DLL) +#if defined(__MINGW32__) || defined(__CYGWIN__) +#ifdef CONFIG_WIN32DLL set_path_env(); #endif -#if defined(__MINGW32__) || defined(__CYGWIN__) #ifdef CONFIG_GUI void *runningmplayer = FindWindow("MPlayer GUI for Windows", "MPlayer for Windows"); if(runningmplayer && filename && use_gui){ @@ -441,8 +441,8 @@ #endif #ifdef CONFIG_FONTCONFIG if(font_fontconfig <= 0) +#endif { -#endif #ifdef CONFIG_BITMAP_FONT if(font_name){ vo_font=read_font_desc(font_name,font_factor,verbose>1); @@ -462,9 +462,7 @@ else sub_font = vo_font; #endif -#ifdef CONFIG_FONTCONFIG } -#endif vo_init_osd();