Commit 489f9371 authored by Geoff Voelker's avatar Geoff Voelker

Use new names for w32 files

parent a0d14345
...@@ -114,15 +114,15 @@ ...@@ -114,15 +114,15 @@
(garbage-collect) (garbage-collect)
(load "disp-table") ; needed to setup ibm-pc char set, see internal.el (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
(garbage-collect) (garbage-collect)
(load "dos-nt") (load "dos-w32")
(garbage-collect) (garbage-collect)
(load "winnt") (load "w32-fns")
(garbage-collect))) (garbage-collect)))
(if (eq system-type 'ms-dos) (if (eq system-type 'ms-dos)
(progn (progn
(load "ls-lisp") (load "ls-lisp")
(garbage-collect) (garbage-collect)
(load "dos-nt") (load "dos-w32")
(garbage-collect) (garbage-collect)
(load "dos-fns") (load "dos-fns")
(garbage-collect) (garbage-collect)
......
...@@ -599,14 +599,14 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) ...@@ -599,14 +599,14 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj)
#ifdef MSDOS #ifdef MSDOS
#define MSDOS_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ #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 #else
#define MSDOS_SUPPORT #define MSDOS_SUPPORT
#endif #endif
#ifdef WINDOWSNT #ifdef WINDOWSNT
#define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}winnt.elc \ #define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}w32-fns.elc \
${lispsource}dos-nt.elc ${lispsource}dos-w32.elc
#else #else
#define WINNT_SUPPORT #define WINNT_SUPPORT
#endif #endif
...@@ -702,7 +702,7 @@ SOME_MACHINE_LISP = ${dotdot}/lisp/faces.elc ${dotdot}/lisp/facemenu.elc \ ...@@ -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/select.elc ${dotdot}/lisp/scroll-bar.elc \
${dotdot}/lisp/vmsproc.elc ${dotdot}/lisp/vms-patch.elc \ ${dotdot}/lisp/vmsproc.elc ${dotdot}/lisp/vms-patch.elc \
${dotdot}/lisp/ls-lisp.elc ${dotdot}/lisp/dos-fns.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. /* Construct full set of libraries to be linked.
Note that SunOS needs -lm to come before -lc; otherwise, you get Note that SunOS needs -lm to come before -lc; otherwise, you get
......
...@@ -47,7 +47,7 @@ extern char *strerror (); ...@@ -47,7 +47,7 @@ extern char *strerror ();
#include <windows.h> #include <windows.h>
#include <stdlib.h> /* for proper declaration of environ */ #include <stdlib.h> /* for proper declaration of environ */
#include <fcntl.h> #include <fcntl.h>
#include "nt.h" #include "w32.h"
#define _P_NOWAIT 1 /* from process.h */ #define _P_NOWAIT 1 /* from process.h */
#endif #endif
......
This diff is collapsed.
...@@ -28,7 +28,7 @@ Boston, MA 02111-1307, USA. ...@@ -28,7 +28,7 @@ Boston, MA 02111-1307, USA.
extern BOOL ctrl_c_handler (unsigned long type); 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. */ /* A convenient type for keeping all the info about a mapped file together. */
typedef struct file_data { typedef struct file_data {
......
...@@ -75,9 +75,9 @@ Boston, MA 02111-1307, USA. ...@@ -75,9 +75,9 @@ Boston, MA 02111-1307, USA.
#undef getservbyname #undef getservbyname
#endif #endif
#include "nt.h" #include "w32.h"
#include "ndir.h" #include "ndir.h"
#include "ntheap.h" #include "w32heap.h"
/* Get the current working directory. */ /* Get the current working directory. */
char * char *
......
...@@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA. ...@@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA.
#include "disptab.h" #include "disptab.h"
#include "termhooks.h" #include "termhooks.h"
#include "ntinevt.h" #include "w32inevt.h"
/* from window.c */ /* from window.c */
extern Lisp_Object Frecenter (); extern Lisp_Object Frecenter ();
......
...@@ -33,7 +33,7 @@ Boston, MA 02111-1307, USA. */ ...@@ -33,7 +33,7 @@ Boston, MA 02111-1307, USA. */
#include "keyboard.h" #include "keyboard.h"
#include "blockinput.h" #include "blockinput.h"
#include "paths.h" #include "paths.h"
#include "ntheap.h" #include "w32heap.h"
#include "termhooks.h" #include "termhooks.h"
#include <commdlg.h> #include <commdlg.h>
......
...@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA. ...@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA.
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "ntheap.h" #include "w32heap.h"
#include "lisp.h" /* for VALMASK */ #include "lisp.h" /* for VALMASK */
/* This gives us the page size and the size of the allocation unit on NT. */ /* This gives us the page size and the size of the allocation unit on NT. */
......
...@@ -40,7 +40,7 @@ Boston, MA 02111-1307, USA. ...@@ -40,7 +40,7 @@ Boston, MA 02111-1307, USA.
#include <windows.h> #include <windows.h>
#include "lisp.h" #include "lisp.h"
#include "nt.h" #include "w32.h"
#include "systime.h" #include "systime.h"
#include "syswait.h" #include "syswait.h"
#include "process.h" #include "process.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment