# HG changeset patch
# User taro@ttg008
# Date 1351434129 -32400
# Node ID 1a8ef61b6278d874a799b6bb1d8d214f5cdd2280
# Parent  5a8f1e3793567152e0a171d01e88228293f43d4c
mod

diff -r 5a8f1e379356 -r 1a8ef61b6278 nt/cmdproxy.c
--- a/nt/cmdproxy.c	Sun Oct 28 23:14:21 2012 +0900
+++ b/nt/cmdproxy.c	Sun Oct 28 23:22:09 2012 +0900
@@ -46,7 +46,7 @@
 #define stdout GetStdHandle (STD_OUTPUT_HANDLE)
 #define stderr GetStdHandle (STD_ERROR_HANDLE)
 
-int
+static int
 vfprintf (HANDLE hnd, const char * msg, va_list args)
 {
   DWORD bytes_written;
@@ -56,7 +56,7 @@
   return WriteFile (hnd, buf, strlen (buf), &bytes_written, NULL);
 }
 
-int
+static int
 fprintf (HANDLE hnd, const char * msg, ...)
 {
   va_list args;
@@ -69,7 +69,7 @@
   return rc;
 }
 
-int
+static int
 printf (const char * msg, ...)
 {
   va_list args;
diff -r 5a8f1e379356 -r 1a8ef61b6278 nt/nmake.defs
--- a/nt/nmake.defs	Sun Oct 28 23:14:21 2012 +0900
+++ b/nt/nmake.defs	Sun Oct 28 23:22:09 2012 +0900
@@ -110,7 +110,7 @@
 RC_OUT		= -Fo
 RC_INCLUDE	= -i
 
-USE_CRT_DLL	= 1
+#USE_CRT_DLL	= 1
 
 !ifdef USE_CRT_DLL
 libc		= msvcrt$(D).lib
diff -r 5a8f1e379356 -r 1a8ef61b6278 src/w32.c
--- a/src/w32.c	Sun Oct 28 23:14:21 2012 +0900
+++ b/src/w32.c	Sun Oct 28 23:22:09 2012 +0900
@@ -5919,18 +5919,18 @@
 				 + strlen (load_path));
 
 	  sprintf (buffer,
-		   TEXT ("The Emacs Windows initialization file \"%s.el\" "
+		   "The Emacs Windows initialization file \"%s.el\" "
 		   "could not be found in your Emacs installation.  "
 		   "Emacs checked the following directories for this file:\n"
 		   "\n%s\n\n"
 		   "When Emacs cannot find this file, it usually means that it "
 		   "was not installed properly, or its distribution file was "
 		   "not unpacked properly.\nSee the README.W32 file in the "
-		   "top-level Emacs directory for more information."),
+		   "top-level Emacs directory for more information.",
 		   init_file_name, load_path);
 	  MessageBox (NULL,
 		      buffer,
-		      TEXT ("Emacs Abort Dialog"),
+		      "Emacs Abort Dialog",
 		      MB_OK | MB_ICONEXCLAMATION | MB_TASKMODAL);
       /* Use the low-level Emacs abort. */
 #undef abort
diff -r 5a8f1e379356 -r 1a8ef61b6278 src/w32fns.c
--- a/src/w32fns.c	Sun Oct 28 23:14:21 2012 +0900
+++ b/src/w32fns.c	Sun Oct 28 23:22:09 2012 +0900
@@ -8349,14 +8349,14 @@
 {
   int button;
   button = MessageBox (NULL,
-		      TEXT("A fatal error has occurred!\n\n"
+		       "A fatal error has occurred!\n\n"
 		       "Would you like to attach a debugger?\n\n"
 		       "Select YES to debug, NO to abort Emacs"
 #if __GNUC__
 		       "\n\n(type \"gdb -p <emacs-PID>\" and\n"
 		       "\"continue\" inside GDB before clicking YES.)"
 #endif
-		       ), TEXT("Emacs Abort Dialog"),
+		       , "Emacs Abort Dialog",
 		       MB_ICONEXCLAMATION | MB_TASKMODAL
 		       | MB_SETFOREGROUND | MB_YESNO);
   switch (button)
diff -r 5a8f1e379356 -r 1a8ef61b6278 src/w32menu.c
--- a/src/w32menu.c	Sun Oct 28 23:14:21 2012 +0900
+++ b/src/w32menu.c	Sun Oct 28 23:22:09 2012 +0900
@@ -1539,7 +1539,7 @@
       if (unicode_set_menu_item_info)
 	{
 	  MENUITEMINFOW info;
-	  bzero (&info, sizeof (info));
+	  memset (&info, 0, sizeof (info));
 	  info.cbSize = sizeof (info);
 	  info.fMask = MIIM_DATA;