(MIN_CHAR_GREEK): Comment out.

[chise/xemacs-chise.git-] / src / objects-msw.c

diff --git a/src/objects-msw.c b/src/objects-msw.c
index abe2a0e..b7a8309 100644 (file)
--- a/src/objects-msw.c
+++ b/src/objects-msw.c
@@ -41,19 +41,16 @@ Boston, MA 02111-1307, USA.  */
 #include "console-msw.h"
 #include "objects-msw.h"
 
-#ifdef CHAR_IS_UCS4
-#include "character.h"
-#else
 #ifdef MULE
-#include "mule-charset.h"
-#endif
+#include "character.h"
 #endif
 
 #include "buffer.h"
 #include "device.h"
 #include "insdel.h"
 
-#if defined(__CYGWIN32__) || defined(__MINGW32__)
+#if (defined(__CYGWIN32__) || defined(__MINGW32__)) && \
+       CYGWIN_VERSION_DLL_MAJOR < 21
 #define stricmp strcasecmp
 #define FONTENUMPROC FONTENUMEXPROC
 #define ntmTm ntmentm
@@ -1070,8 +1067,7 @@ mswindows_initialize_color_instance (struct Lisp_Color_Instance *c, Lisp_Object
 
 #if 0
 static void
-mswindows_mark_color_instance (struct Lisp_Color_Instance *c,
-                        void (*markobj) (Lisp_Object))
+mswindows_mark_color_instance (struct Lisp_Color_Instance *c)
 {
 }
 #endif
@@ -1109,7 +1105,7 @@ mswindows_color_instance_equal (struct Lisp_Color_Instance *c1,
 static unsigned long
 mswindows_color_instance_hash (struct Lisp_Color_Instance *c, int depth)
 {
-  return (unsigned long)(COLOR_INSTANCE_MSWINDOWS_COLOR(c));
+  return (unsigned long) COLOR_INSTANCE_MSWINDOWS_COLOR(c);
 }
 
 static Lisp_Object
@@ -1410,8 +1406,7 @@ mswindows_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object na
 
 #if 0
 static void
-mswindows_mark_font_instance (struct Lisp_Font_Instance *f,
-                       void (*markobj) (Lisp_Object))
+mswindows_mark_font_instance (struct Lisp_Font_Instance *f)
 {
 }
 #endif