--- a/src/intl-win32.c	Sat Dec 26 00:20:27 2009 -0600
+++ b/src/intl-win32.c	Sat Dec 26 21:18:49 2009 -0600
@@ -783,7 +783,7 @@
 If SUBLANG is omitted, "SUBLANG_DEFAULT" is used.
 
 Recognized language names are
-(some may not be recognized if the compiler is older than VC++ 6.0)
+\(some may not be recognized if the compiler is older than VC++ 6.0)
 
 "AFRIKAANS"
 "ALBANIAN"
@@ -858,7 +858,7 @@
 "VIETNAMESE"
 
 Recognized sub-language names are
-(some may not be recognized if the compiler is older than VC++ 6.0)
+\(some may not be recognized if the compiler is older than VC++ 6.0)
 
 "ARABIC_ALGERIA"
 "ARABIC_BAHRAIN"
@@ -1569,6 +1569,7 @@
 int
 wcscmp (const wchar_t *s1, const wchar_t *s2)
 {
+  if (s1 == NULL || s2 == NULL) return NULL;
   while (*s1 != '\0' && *s1 == *s2)
     {
       s1++;
@@ -1585,6 +1586,7 @@
 size_t
 wcslen (const wchar_t *str)
 {
+  if (str == NULL) return NULL;
   const wchar_t *start = str;
 
   while (*str)
@@ -1598,6 +1600,7 @@
 wchar_t *
 wcsncpy (wchar_t *dst0, const wchar_t *src0, size_t count)
 {
+  if (dst0 == NULL || src0 == NULL) return NULL;
   wchar_t *dscan;
   const wchar_t *sscan;
 
@@ -1618,6 +1621,7 @@
 wchar_t *
 wcscpy (wchar_t *dst0, const wchar_t *src0)
 {
+  if (dst0 == NULL || src0 == NULL) return NULL;
   wchar_t *s = dst0;
 
   while ((*dst0++ = *src0++))
@@ -1629,6 +1633,7 @@
 wchar_t *
 wcsdup (const wchar_t *str)
 {
+  if (str == NULL) return NULL;
   int len = wcslen (str) + 1;
   wchar_t *val = xnew_array (wchar_t, len);
 
@@ -2344,7 +2349,7 @@
 void
 complex_vars_of_intl_win32 (void)
 {
-  Fmake_coding_system
+  Fmake_coding_system_internal
     (Qmswindows_unicode, Qunicode,
      build_msg_string ("MS Windows Unicode"),
      nconc2 (list4 (Qdocumentation,
@@ -2353,7 +2358,7 @@
 "This encoding is equivalent to standard UTF16, little-endian."
 ),
 		    Qmnemonic, build_string ("MSW-U")),
-	     list4 (Qtype, Qutf_16,
+	     list4 (Qunicode_type, Qutf_16,
 		    Qlittle_endian, Qt)));
 
 #ifdef MULE