Mercurial > hg > xemacs-beta

changeset 5009:2eec7322eb7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Miscellaneous small fixes to Windows VS6 build
author Vin Shelton <acs@xemacs.org>
date Tue, 09 Feb 2010 16:25:04 -0500
parents ecdc03ef6e12
children 42f525618765
files src/ChangeLog src/glyphs-eimage.c src/objects-msw.c
diffstat 3 files changed, 37 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Feb 08 20:45:21 2010 -0500
+++ b/src/ChangeLog	Tue Feb 09 16:25:04 2010 -0500
@@ -1,3 +1,10 @@
+2010-02-09  Vin Shelton  <acs@xemacs.org>
+
+	* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
+	Declare hfont at start of a code block.
+
+	* glyphs-eimage.c: Undefine and then redefine FAR around the jpeg headers.
+
 2010-02-08  Vin Shelton  <acs@xemacs.org>
 
 	* nt.c (open_unc_volume): lpRemoteName is an XELPTSTR.
--- a/src/glyphs-eimage.c	Mon Feb 08 20:45:21 2010 -0500
+++ b/src/glyphs-eimage.c	Tue Feb 09 16:25:04 2010 -0500
@@ -120,8 +120,15 @@
 #define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
 #endif
 
+/* Yet more breakage... jmorecfg.h unconditionally defines FAR either as
+   "far" or as blank.  Windef.h unconditionally defines FAR as "far".
+   We'll avoid the compile warning by redefing FAR the way windows defines it,
+   after loading the JPEG headers. */
+#undef FAR
 #include <jpeglib.h>
 #include <jerror.h>
+#undef FAR
+#define FAR far
 
 END_C_DECLS
 
--- a/src/objects-msw.c	Mon Feb 08 20:45:21 2010 -0500
+++ b/src/objects-msw.c	Tue Feb 09 16:25:04 2010 -0500
@@ -2081,28 +2081,30 @@
 	  assert(0);
 	}
 
-      HFONT hfont = create_hfont_from_font_spec (the_nonreloc, hdc, Qnil,
-						 font_list,
-						 ERROR_ME_DEBUG_WARN,
-						 &truename);
+      {
+	HFONT hfont = create_hfont_from_font_spec (the_nonreloc, hdc, Qnil,
+						   font_list,
+						   ERROR_ME_DEBUG_WARN,
+						   &truename);
 
-      if (!hfont || !(hfont = (HFONT) SelectObject (hdc, hfont)))
-	{
-	nope:
-	  DeleteDC (hdc);
-	  UNGCPRO;
-	  return 0;
-	}
-    
-      if (GetTextCharsetInfo (hdc, &fs, 0) == DEFAULT_CHARSET)
-	{
-	  SelectObject (hdc, hfont);
-	  goto nope;
-	}
-      SelectObject (hdc, hfont);
-      DeleteDC (hdc);
-      Fputhash (reloc, make_opaque (&fs, sizeof (fs)), Vfont_signature_data);
-      UNGCPRO;
+	if (!hfont || !(hfont = (HFONT) SelectObject (hdc, hfont)))
+	  {
+	    nope:
+	    DeleteDC (hdc);
+	    UNGCPRO;
+	    return 0;
+	  }
+
+	if (GetTextCharsetInfo (hdc, &fs, 0) == DEFAULT_CHARSET)
+	  {
+	    SelectObject (hdc, hfont);
+	    goto nope;
+	  }
+	SelectObject (hdc, hfont);
+	DeleteDC (hdc);
+	Fputhash (reloc, make_opaque (&fs, sizeof (fs)), Vfont_signature_data);
+	UNGCPRO;
+      }
     }
 
   {