diff -U5 -rN --strip-trailing-cr -x '*.obj' -x '*.exe' -x '*.lib' -x '*.res' -x '*.dll' xyzzy-0.2.235.org/src/Makefile xyzzy-0.2.235.copy/src/Makefile
--- xyzzy-0.2.235.org/src/Makefile	2005-12-07 23:20:12.000000000 +0900
+++ xyzzy-0.2.235.copy/src/Makefile	2008-09-15 20:14:59.000000000 +0900
@@ -1,8 +1,8 @@
 
 # define VC++ version (4, 6, or 7)
-VCVER=4
+VCVER=9
 
 .SUFFIXES: .cc .rc .res .d
 
 SRCS=\
 Buffer.cc \
@@ -138,11 +138,15 @@
 !ELSE
 CXXOPT=-GF -EHa
 !ENDIF
 
 DEFS=-DSTRICT -DWIN32 -D_WIN32 -D_MT -D__XYZZY__ -DPRIVCTRL_NODLL -DHAVE_DIMM_H -DDEBUG_GC
+!IF "$(VCVER)" == "9"
+CXX=cl -nologo -Zc:wchar_t- -Zc:forScope- -D_CRT_SECURE_NO_DEPRECATE
+!ELSE
 CXX=cl -nologo
+!ENDIF
 CPP=cl -nologo -E
 LD=link -nologo
 LIBS=kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib \
 comctl32.lib imm32.lib setargv.obj comdlg32.lib mpr.lib ole32.lib \
 oleaut32.lib winspool.lib zlib/zlib.lib 
diff -U5 -rN --strip-trailing-cr -x '*.obj' -x '*.exe' -x '*.lib' -x '*.res' -x '*.dll' xyzzy-0.2.235.org/src/afxres.h xyzzy-0.2.235.copy/src/afxres.h
--- xyzzy-0.2.235.org/src/afxres.h	1970-01-01 09:00:00.000000000 +0900
+++ xyzzy-0.2.235.copy/src/afxres.h	2008-09-15 20:14:59.000000000 +0900
@@ -0,0 +1,2 @@
+#include <windows.h>
+#define IDC_STATIC      (-1)
diff -U5 -rN --strip-trailing-cr -x '*.obj' -x '*.exe' -x '*.lib' -x '*.res' -x '*.dll' xyzzy-0.2.235.org/src/archiver.cc xyzzy-0.2.235.copy/src/archiver.cc
--- xyzzy-0.2.235.org/src/archiver.cc	2002-08-12 01:58:40.000000000 +0900
+++ xyzzy-0.2.235.copy/src/archiver.cc	2008-09-15 20:14:59.000000000 +0900
@@ -75,11 +75,11 @@
 }
 
 static char *
 copy_path (char *b, const char *o, const char *d, int dirp = 0)
 {
-  char *spc = strchr (d, ' ');
+  const char *spc = strchr (d, ' ');
   if (spc)
     *b++ = '"';
   b = stpcpy (b, o);
   char *b0 = b;
   b = docopy (b, d);
diff -U5 -rN --strip-trailing-cr -x '*.obj' -x '*.exe' -x '*.lib' -x '*.res' -x '*.dll' xyzzy-0.2.235.org/src/dyn-handle.h xyzzy-0.2.235.copy/src/dyn-handle.h
--- xyzzy-0.2.235.org/src/dyn-handle.h	1997-12-20 18:15:50.000000000 +0900
+++ xyzzy-0.2.235.copy/src/dyn-handle.h	2008-09-15 20:14:59.000000000 +0900
@@ -2,11 +2,11 @@
 # define _DYN_HANDLE_H_
 
 class dyn_handle
 {
 private:
-  operator = (const dyn_handle &);
+  void operator = (const dyn_handle &);
 protected:
   HANDLE h;
 public:
   dyn_handle ();
   dyn_handle (HANDLE);
diff -U5 -rN --strip-trailing-cr -x '*.obj' -x '*.exe' -x '*.lib' -x '*.res' -x '*.dll' xyzzy-0.2.235.org/src/encoding.cc xyzzy-0.2.235.copy/src/encoding.cc
--- xyzzy-0.2.235.org/src/encoding.cc	2005-03-16 20:55:06.000000000 +0900
+++ xyzzy-0.2.235.copy/src/encoding.cc	2008-09-15 20:14:59.000000000 +0900
@@ -615,19 +615,19 @@
   switch (lang)
     {
     default:
     case ENCODING_LANG_JP:
     case ENCODING_LANG_JP2:
-      return putw_jp;
+      return &putw_jp;
 
     case ENCODING_LANG_KR:
     case ENCODING_LANG_CN_GB:
     case ENCODING_LANG_CN_BIG5:
-      return putw_gen;
+      return &putw_gen;
 
     case ENCODING_LANG_CN:
-      return putw_cn;
+      return &putw_cn;
     }
 }
 
 void
 utf_to_internal_stream::putw_jp (ucs2_t wc)
diff -U5 -rN --strip-trailing-cr -x '*.obj' -x '*.exe' -x '*.lib' -x '*.res' -x '*.dll' xyzzy-0.2.235.org/src/environ.h xyzzy-0.2.235.copy/src/environ.h
--- xyzzy-0.2.235.org/src/environ.h	2001-03-17 06:05:46.000000000 +0900
+++ xyzzy-0.2.235.copy/src/environ.h	2008-09-15 20:14:59.000000000 +0900
@@ -35,11 +35,11 @@
 {
   if (hkey)
     RegCloseKey (hkey);
 }
 
-inline
+inline int
 Registry::fail () const
 {
   return !hkey;
 }
 
diff -U5 -rN --strip-trailing-cr -x '*.obj' -x '*.exe' -x '*.lib' -x '*.res' -x '*.dll' xyzzy-0.2.235.org/src/insdel.cc xyzzy-0.2.235.copy/src/insdel.cc
--- xyzzy-0.2.235.org/src/insdel.cc	2001-07-22 21:39:52.000000000 +0900
+++ xyzzy-0.2.235.copy/src/insdel.cc	2008-09-15 20:14:59.000000000 +0900
@@ -163,13 +163,13 @@
 {
   memmove (dp->c_text + dst, sp->c_text + src, sizeof (Char) * size);
 }
 
 static void
-adjust (const Chunk *&chunk, int &offset)
+adjust (Chunk *&chunk, int &offset)
 {
-  const Chunk *cp = chunk;
+  Chunk *cp = chunk;
   int o = offset;
   while (o > cp->c_used)
     {
       o -= cp->c_used;
       cp = cp->c_next;
@@ -225,13 +225,13 @@
   w_point.p_chunk = prev;
   w_point.p_offset = pused;
 }
 
 static void
-adjust_dst (const Chunk *&chunk, int &offset)
+adjust_dst (Chunk *&chunk, int &offset)
 {
-  const Chunk *cp = chunk;
+  Chunk *cp = chunk;
   int o = offset;
   while (o > Chunk::TEXT_SIZE)
     {
       o -= Chunk::TEXT_SIZE;
       cp = cp->c_next;
diff -U5 -rN --strip-trailing-cr -x '*.obj' -x '*.exe' -x '*.lib' -x '*.res' -x '*.dll' xyzzy-0.2.235.org/src/minibuf.cc xyzzy-0.2.235.copy/src/minibuf.cc
--- xyzzy-0.2.235.org/src/minibuf.cc	2002-03-06 23:42:26.000000000 +0900
+++ xyzzy-0.2.235.copy/src/minibuf.cc	2008-09-15 20:14:59.000000000 +0900
@@ -255,11 +255,11 @@
           lpkg = Ffind_package (lpkg);
           if (lpkg != Qnil)
             package = lpkg;
         }
 
-      const Char *b = xstring_contents (string);
+      Char *b = xstring_contents (string);
       int l = xstring_length (string);
 
       maybe_symbol_string mss (package);
       mss.parse (b, l);
       package = mss.current_package ();
@@ -525,11 +525,11 @@
       lpkg = Ffind_package (lpkg);
       if (lpkg != Qnil)
         package = lpkg;
     }
 
-  const Char *b = xstring_contents (c_target);
+  Char *b = xstring_contents (c_target);
   int l = xstring_length (c_target);
 
   maybe_symbol_string mss (package);
   mss.parse (b, l);
   package = mss.current_package ();
diff -U5 -rN --strip-trailing-cr -x '*.obj' -x '*.exe' -x '*.lib' -x '*.res' -x '*.dll' xyzzy-0.2.235.org/src/package.cc xyzzy-0.2.235.copy/src/package.cc
--- xyzzy-0.2.235.org/src/package.cc	2000-04-02 03:44:12.000000000 +0900
+++ xyzzy-0.2.235.copy/src/package.cc	2008-09-15 20:14:59.000000000 +0900
@@ -651,15 +651,15 @@
     }
   return 0;
 }
 
 void
-maybe_symbol_string::parse (const Char *&xb, int &xl)
+maybe_symbol_string::parse (Char *&xb, int &xl)
 {
-  const Char *b = xb;
-  const Char *be = b + xl;
-  for (const Char *colon = b; colon < be; colon++)
+  Char *b = xb;
+  Char *be = b + xl;
+  for (Char *colon = b; colon < be; colon++)
     if (*colon == ':')
       {
         if (colon == b)
           package = xsymbol_value (Vkeyword_package);
         else
diff -U5 -rN --strip-trailing-cr -x '*.obj' -x '*.exe' -x '*.lib' -x '*.res' -x '*.dll' xyzzy-0.2.235.org/src/package.h xyzzy-0.2.235.copy/src/package.h
--- xyzzy-0.2.235.org/src/package.h	1997-12-06 23:55:26.000000000 +0900
+++ xyzzy-0.2.235.copy/src/package.h	2008-09-15 20:14:59.000000000 +0900
@@ -93,10 +93,10 @@
   lisp package;
   const Char *pkge;
 public:
   maybe_symbol_string (lisp pkg) : package (pkg), pkge (0) {}
   lisp current_package () const {return package;}
-  void parse (const Char *&b, int &l);
+  void parse (Char *&b, int &l);
   const Char *pkg_end () const {return pkge;}
 };
 
 #endif
diff -U5 -rN --strip-trailing-cr -x '*.obj' -x '*.exe' -x '*.lib' -x '*.res' -x '*.dll' xyzzy-0.2.235.org/src/syntax.cc xyzzy-0.2.235.copy/src/syntax.cc
--- xyzzy-0.2.235.org/src/syntax.cc	2004-01-21 23:41:56.000000000 +0900
+++ xyzzy-0.2.235.copy/src/syntax.cc	2008-09-15 20:14:59.000000000 +0900
@@ -3876,11 +3876,11 @@
 u_char syntax_state::ss_maybe_comment[SS_MAX];
 lisp syntax_state::ss_hashtab;
 const syntax_table *syntax_state::ss_tab;
 Buffer *syntax_state::ss_bp;
 Chunk *syntax_state::ss_chunk;
-void (syntax_state::*syntax_state::update)(Char);
+void (syntax_state::*syntax_state::update)(const Char *);
 
 void
 syntax_state::init_color_table ()
 {
   int prev, cur, next;
diff -U5 -rN --strip-trailing-cr -x '*.obj' -x '*.exe' -x '*.lib' -x '*.res' -x '*.dll' xyzzy-0.2.235.org/src/xdde.h xyzzy-0.2.235.copy/src/xdde.h
--- xyzzy-0.2.235.org/src/xdde.h	1999-08-11 01:27:54.000000000 +0900
+++ xyzzy-0.2.235.copy/src/xdde.h	2008-09-15 20:19:17.000000000 +0900
@@ -226,11 +226,11 @@
      : hdata (h_)
 {
   d = DdeAccessData (hdata, &len);
 }
 
-inline
+inline int
 DdeDataP::length () const
 {
   return len;
 }