From 76ed5e0157c14cf9fcd075db08296bd692a43fc7 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Fri, 18 Jan 2008 15:15:07 +0000 Subject: [PATCH] * movemail.c: Remove references to XENIX. * m/intel386.h: Remove references to XENIX. --- lib-src/ChangeLog | 4 ++++ lib-src/movemail.c | 10 +++------- src/ChangeLog | 4 ++++ src/m/intel386.h | 23 ----------------------- 4 files changed, 11 insertions(+), 30 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index bb28500d68d..c0d0bbbf41b 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2008-01-18 Dan Nicolaescu + + * movemail.c: Remove references to XENIX. + 2008-01-13 Dan Nicolaescu * movemail.c: diff --git a/lib-src/movemail.c b/lib-src/movemail.c index daf8c6166e6..1f95735878d 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -113,7 +113,7 @@ Boston, MA 02110-1301, USA. */ #define R_OK 4 #endif -#if defined (XENIX) || defined (WINDOWSNT) +#ifdef WINDOWSNT #include #endif @@ -388,13 +388,13 @@ main (argc, argv) if (indesc < 0) pfatal_with_name (inname); -#if defined (BSD_SYSTEM) || defined (XENIX) +#ifdef BSD_SYSTEM /* In case movemail is setuid to root, make sure the user can read the output file. */ /* This is desirable for all systems but I don't want to assume all have the umask system call */ umask (umask (0) & 0333); -#endif /* BSD_SYSTEM || XENIX */ +#endif /* BSD_SYSTEM */ outdesc = open (outname, O_WRONLY | O_CREAT | O_EXCL, 0666); if (outdesc < 0) pfatal_with_name (outname); @@ -422,15 +422,11 @@ main (argc, argv) #ifdef MAIL_USE_LOCKF status = lockf (indesc, F_LOCK, 0); #else /* not MAIL_USE_LOCKF */ -#ifdef XENIX - status = locking (indesc, LK_RLCK, 0L); -#else #ifdef WINDOWSNT status = locking (indesc, LK_RLCK, -1L); #else status = flock (indesc, LOCK_EX); #endif -#endif #endif /* not MAIL_USE_LOCKF */ #endif /* MAIL_USE_SYSTEM_LOCK */ } diff --git a/src/ChangeLog b/src/ChangeLog index b641635484b..d63c039592a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-01-18 Dan Nicolaescu + + * m/intel386.h: Remove references to XENIX. + 2008-01-17 Andreas Schwab * m/amdx86-64.h (START_FILES, LIB_STANDARD): Use HAVE_LIB64_DIR diff --git a/src/m/intel386.h b/src/m/intel386.h index 17969dd16e4..680a2cc106d 100644 --- a/src/m/intel386.h +++ b/src/m/intel386.h @@ -142,28 +142,6 @@ NOTE-END */ /* #define VIRT_ADDR_VARIES */ -#ifdef XENIX -/* Define NO_REMAP if memory segmentation makes it not work well - to change the boundary between the text section and data section - when Emacs is dumped. If you define this, the preloaded Lisp - code will not be sharable; but that's better than failing completely. */ - -#define NO_REMAP - -/* Since cannot purify, use standard Xenix 386 startup code. */ - -#define START_FILES /lib/386/Sseg.o pre-crt0.o /lib/386/Scrt0.o - -/* These really use terminfo. */ - -#define LIBS_TERMCAP /lib/386/Slibcurses.a \ - /lib/386/Slibtinfo.a /lib/386/Slibx.a - -/* Standard libraries for this machine. Since `-l' doesn't work in `ld'. */ -/* '__fltused' is unresolved w/o Slibcfp.a */ -#define LIB_STANDARD /lib/386/Slibcfp.a /lib/386/Slibc.a -#else /* not XENIX */ - /* this brings in alloca() if we're using cc */ #ifdef USG #ifndef LIB_STANDARD @@ -177,7 +155,6 @@ NOTE-END */ #define NO_REMAP #define TEXT_START 0 #endif /* USG */ -#endif /* not XENIX */ #ifdef USG5_4 #define DATA_SEG_BITS 0x08000000 -- 2.39.2