Use new names for w32 files

lisp/loadup.el

@@ -114,15 +114,15 @@
       (garbage-collect)
       (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
       (garbage-collect)
-      (load "dos-nt")
+      (load "dos-w32")
       (garbage-collect)
-      (load "winnt")
+      (load "w32-fns")
       (garbage-collect)))
 (if (eq system-type 'ms-dos)
     (progn
       (load "ls-lisp")
       (garbage-collect)
-      (load "dos-nt")
+      (load "dos-w32")
       (garbage-collect)
       (load "dos-fns")
       (garbage-collect)

src/Makefile.in

@@ -599,14 +599,14 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj)
 
 #ifdef MSDOS
 #define MSDOS_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \
- ${lispsource}dos-fns.elc ${lispsource}dos-nt.elc
+ ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc
 #else
 #define MSDOS_SUPPORT
 #endif
 
 #ifdef WINDOWSNT
-#define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}winnt.elc \
-  ${lispsource}dos-nt.elc
+#define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}w32-fns.elc \
+  ${lispsource}dos-w32.elc
 #else
 #define WINNT_SUPPORT
 #endif
@@ -702,7 +702,7 @@ SOME_MACHINE_LISP =  ${dotdot}/lisp/faces.elc ${dotdot}/lisp/facemenu.elc \
   ${dotdot}/lisp/select.elc ${dotdot}/lisp/scroll-bar.elc \
   ${dotdot}/lisp/vmsproc.elc ${dotdot}/lisp/vms-patch.elc \
   ${dotdot}/lisp/ls-lisp.elc ${dotdot}/lisp/dos-fns.elc \
-  ${dotdot}/lisp/winnt.elc ${dotdot}/lisp/dos-nt.elc
+  ${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc
 
 /* Construct full set of libraries to be linked.
    Note that SunOS needs -lm to come before -lc; otherwise, you get

src/callproc.c

@@ -47,7 +47,7 @@ extern char *strerror ();
 #include <windows.h>
 #include <stdlib.h>	/* for proper declaration of environ */
 #include <fcntl.h>
-#include "nt.h"
+#include "w32.h"
 #define _P_NOWAIT 1	/* from process.h */
 #endif
 

src/unexw32.c

@@ -28,7 +28,7 @@ Boston, MA 02111-1307, USA.
 
 extern BOOL ctrl_c_handler (unsigned long type);
 
-#include "ntheap.h"
+#include "w32heap.h"
 
 /* A convenient type for keeping all the info about a mapped file together.  */
 typedef struct file_data {

src/w32.c

@@ -75,9 +75,9 @@ Boston, MA 02111-1307, USA.
 #undef getservbyname
 #endif
 
-#include "nt.h"
+#include "w32.h"
 #include "ndir.h"
-#include "ntheap.h"
+#include "w32heap.h"
 
 /* Get the current working directory.  */
 char *

src/w32console.c

@@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA.
 #include "disptab.h"
 #include "termhooks.h"
 
-#include "ntinevt.h"
+#include "w32inevt.h"
 
 /* from window.c */
 extern Lisp_Object Frecenter ();

src/w32fns.c

@@ -33,7 +33,7 @@ Boston, MA 02111-1307, USA.  */
 #include "keyboard.h"
 #include "blockinput.h"
 #include "paths.h"
-#include "ntheap.h"
+#include "w32heap.h"
 #include "termhooks.h"
 
 #include <commdlg.h>

src/w32heap.c

@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA.
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "ntheap.h"
+#include "w32heap.h"
 #include "lisp.h"  /* for VALMASK */
 
 /* This gives us the page size and the size of the allocation unit on NT.  */

src/w32proc.c

@@ -40,7 +40,7 @@ Boston, MA 02111-1307, USA.
 #include <windows.h>
 
 #include "lisp.h"
-#include "nt.h"
+#include "w32.h"
 #include "systime.h"
 #include "syswait.h"
 #include "process.h"