summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Innes <andrewi@gnu.org>2001-10-18 16:19:43 +0000
committerAndrew Innes <andrewi@gnu.org>2001-10-18 16:19:43 +0000
commitd759df5f191a534d053da476f90953994017e525 (patch)
treec73b31d6c96ed62e0503510e6c2d80d0f28458a8
parent8ff34918f46b24f08a7521af24b5ae70ea37fc4e (diff)
downloademacs-d759df5f191a534d053da476f90953994017e525.tar.gz
(fs_load_font) [WINDOWSNT && _MSC_VER]: Disable
optimization. The fontp->encoding array was not being initialized correctly when compiled with optimizations by MSVC.
-rw-r--r--src/fontset.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/fontset.c b/src/fontset.c
index 5e359ddef8f..e8232e8de1b 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -569,6 +569,10 @@ fontset_font_pattern (f, id, c)
}
+#if defined(WINDOWSNT) && defined (_MSC_VER)
+#pragma optimize("", off)
+#endif
+
/* Load a font named FONTNAME to display character C on frame F.
Return a pointer to the struct font_info of the loaded font. If
loading fails, return NULL. If FACE is non-zero and a fontset is
@@ -694,6 +698,10 @@ fs_load_font (f, c, fontname, id, face)
return fontp;
}
+#if defined(WINDOWSNT) && defined (_MSC_VER)
+#pragma optimize("", on)
+#endif
+
/* Cache data used by fontset_pattern_regexp. The car part is a
pattern string containing at least one wild card, the cdr part is