[vlc-commits] Freetype: do not ship dead code on WinRT dll
Jean-Baptiste Kempf
git at videolan.org
Thu Mar 6 19:21:36 CET 2014
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Mar 6 19:20:52 2014 +0100| [83130c98fdb57cef00d11666e5acd72119a98ad5] | committer: Jean-Baptiste Kempf
Freetype: do not ship dead code on WinRT dll
This allows freetype.dll to pass WACK
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=83130c98fdb57cef00d11666e5acd72119a98ad5
---
modules/text_renderer/platform_fonts.c | 2 +-
modules/text_renderer/platform_fonts.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/text_renderer/platform_fonts.c b/modules/text_renderer/platform_fonts.c
index c1d2e4e..7869dba 100644
--- a/modules/text_renderer/platform_fonts.c
+++ b/modules/text_renderer/platform_fonts.c
@@ -178,7 +178,7 @@ char* FontConfig_Select( filter_t *p_filter, const char* family,
}
#endif
-#ifdef _WIN32
+#if defined( _WIN32 ) && !VLC_WINSTORE_APP
#define FONT_DIR_NT _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts")
static int GetFileFontByName( LPCTSTR font_name, char **psz_filename )
diff --git a/modules/text_renderer/platform_fonts.h b/modules/text_renderer/platform_fonts.h
index 1cb9162..cff52b1 100644
--- a/modules/text_renderer/platform_fonts.h
+++ b/modules/text_renderer/platform_fonts.h
@@ -85,7 +85,7 @@ void FontConfig_BuildCache( filter_t *p_filter );
#endif
-#ifdef _WIN32
+#if defined( _WIN32 ) && !VLC_WINSTORE_APP
char* Win32_Select( filter_t *p_filter, const char* family,
bool b_bold, bool b_italic, int i_size, int *i_idx );
More information about the vlc-commits
mailing list