Mercurial > emacs
changeset 87833:36e4ffad31fe
* movemail.c: Remove references to XENIX.
* m/intel386.h: Remove references to XENIX.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 18 Jan 2008 15:15:07 +0000 |
| parents | 3b07855f66ef |
| children | b7acc6fad5a9 |
| files | lib-src/ChangeLog lib-src/movemail.c src/ChangeLog src/m/intel386.h |
| diffstat | 4 files changed, 11 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Fri Jan 18 15:14:45 2008 +0000 +++ b/lib-src/ChangeLog Fri Jan 18 15:15:07 2008 +0000 @@ -1,3 +1,7 @@ +2008-01-18 Dan Nicolaescu <dann@ics.uci.edu> + + * movemail.c: Remove references to XENIX. + 2008-01-13 Dan Nicolaescu <dann@ics.uci.edu> * movemail.c:
--- a/lib-src/movemail.c Fri Jan 18 15:14:45 2008 +0000 +++ b/lib-src/movemail.c Fri Jan 18 15:15:07 2008 +0000 @@ -113,7 +113,7 @@ #define R_OK 4 #endif -#if defined (XENIX) || defined (WINDOWSNT) +#ifdef WINDOWSNT #include <sys/locking.h> #endif @@ -388,13 +388,13 @@ 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 @@ #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 */ }
--- a/src/ChangeLog Fri Jan 18 15:14:45 2008 +0000 +++ b/src/ChangeLog Fri Jan 18 15:15:07 2008 +0000 @@ -1,3 +1,7 @@ +2008-01-18 Dan Nicolaescu <dann@ics.uci.edu> + + * m/intel386.h: Remove references to XENIX. + 2008-01-17 Andreas Schwab <schwab@suse.de> * m/amdx86-64.h (START_FILES, LIB_STANDARD): Use HAVE_LIB64_DIR
--- a/src/m/intel386.h Fri Jan 18 15:14:45 2008 +0000 +++ b/src/m/intel386.h Fri Jan 18 15:15:07 2008 +0000 @@ -142,28 +142,6 @@ /* #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 @@ #define NO_REMAP #define TEXT_START 0 #endif /* USG */ -#endif /* not XENIX */ #ifdef USG5_4 #define DATA_SEG_BITS 0x08000000