diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/w32font.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a53c16e9da4..46cffde0806 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-10-28 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * w32font.c (w32_load_unicows_or_gdi32): Add missing return. | ||
| 4 | |||
| 1 | 2011-10-28 Eli Zaretskii <eliz@gnu.org> | 5 | 2011-10-28 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | Fix Emacs on Windows 9X (bug#8562). Thanks to oslsachem | 7 | Fix Emacs on Windows 9X (bug#8562). Thanks to oslsachem |
diff --git a/src/w32font.c b/src/w32font.c index fb41989caa7..6c1b4d0bc20 100644 --- a/src/w32font.c +++ b/src/w32font.c | |||
| @@ -216,6 +216,7 @@ w32_load_unicows_or_gdi32 (void) | |||
| 216 | } | 216 | } |
| 217 | else | 217 | else |
| 218 | ret = LoadLibrary ("Gdi32.dll"); | 218 | ret = LoadLibrary ("Gdi32.dll"); |
| 219 | return ret; | ||
| 219 | } | 220 | } |
| 220 | 221 | ||
| 221 | /* The following 3 functions call the problematic "wide" APIs via | 222 | /* The following 3 functions call the problematic "wide" APIs via |
| @@ -2721,4 +2722,3 @@ globals_of_w32font (void) | |||
| 2721 | g_b_init_get_text_metrics_w = 0; | 2722 | g_b_init_get_text_metrics_w = 0; |
| 2722 | g_b_init_get_glyph_outline_w = 0; | 2723 | g_b_init_get_glyph_outline_w = 0; |
| 2723 | } | 2724 | } |
| 2724 | |||