diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2020-08-27 02:07:02 +0000 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2020-08-27 02:07:02 +0000 |
| commit | 677db04fae0af875685a71e0cedd408578071bef (patch) | |
| tree | 4f8b19a0ed3cb153acc614cda5ac312ead4f1993 | |
| parent | 4be6f23e71690e210e5a8ad45f5a5cea3c04cb4f (diff) | |
| parent | 89ae260fb07bbcb28230921e12859c495c6f7bc9 (diff) | |
| download | pango-677db04fae0af875685a71e0cedd408578071bef.tar.gz | |
Merge branch 'master.prec99' into 'master'
Some Visual Studio-related fixes (GIT master)
See merge request GNOME/pango!231
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | pango/pangowin32-fontmap.c | 4 |
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")); |