(fs_load_font) [WINDOWSNT && _MSC_VER]: Disable

optimization.  The fontp->encoding array was not being initialized
correctly when compiled with optimizations by MSVC.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3afdbfcf6c42bee62eced22739f9791b4a7c1371..bdb678eed447b44a61101351a3ea278cdad23764 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-18  Andrew Innes  <andrewi@gnu.org>
+
+       * fontset.c (fs_load_font) [WINDOWSNT && _MSC_VER]: Disable
+       optimization.  The fontp->encoding array was not being initialized
+       correctly when compiled with optimizations by MSVC.
+
 2001-10-18  Gerd Moellmann  <gerd@gnu.org>
 
        * xdisp.c (display_line): Indicate empty lines in active

diff --git a/src/fontset.c b/src/fontset.c
index 983222f4bb706aee61c5d6b91ff6a1c3e1628a17..7e7364b020580d4294907d6892a42c96e9825c6f 100644 (file)
--- 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
+
 \f
 /* Cache data used by fontset_pattern_regexp.  The car part is a
    pattern string containing at least one wild card, the cdr part is