summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meson.build2
-rw-r--r--pango/pangowin32-fontmap.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index 9708f826..160a9152 100644
--- a/meson.build
+++ b/meson.build
@@ -57,7 +57,7 @@ common_ldflags = []
if cc.get_id() == 'msvc'
# Compiler options taken from msvc_recommended_pragmas.h
# in GLib, based on _Win32_Programming_ by Rector and Newcomer
- test_cflags = ['-FImsvc_recommended_pragmas', '-utf-8']
+ test_cflags = ['-FImsvc_recommended_pragmas.h', '-utf-8']
add_project_arguments(cc.get_supported_arguments(test_cflags), language: 'c')
test_c_only_flags = []
elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 8d7e0c06..6bc10a7a 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -1030,8 +1030,10 @@ pango_win32_font_map_load_font (PangoFontMap *fontmap,
for (i = 0; families[i] && !best_match; ++i)
{
+ PangoWin32Family *win32family;
PING (("name=%s", families[i]));
- PangoWin32Family *win32family = g_hash_table_lookup (win32fontmap->families, families[i]);
+
+ win32family = g_hash_table_lookup (win32fontmap->families, families[i]);
if (win32family)
{
PING (("got win32family"));