Mercurial > emacs
changeset 108273:de8de918fbab
Remove NEED_BSDTTY and NEED_UNISTD_H.
* s/hpux10-20.h (NEED_BSDTTY): Remove.
* s/aix4-2.h (NEED_UNISTD_H): Remove.
* systty.h: Simplify conditionals for including <sys/bsdtty.h>,
<sys/ptyio.h> and <unistd.h>.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 06 May 2010 12:46:47 -0700 |
| parents | 87980e1e3597 |
| children | 8416c8d075e3 e14a0bf9fbd0 |
| files | src/ChangeLog src/s/aix4-2.h src/s/hpux10-20.h src/systty.h |
| diffstat | 4 files changed, 8 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu May 06 12:40:02 2010 -0700 +++ b/src/ChangeLog Thu May 06 12:46:47 2010 -0700 @@ -1,5 +1,11 @@ 2010-05-06 Dan Nicolaescu <dann@ics.uci.edu> + Remove NEED_BSDTTY and NEED_UNISTD_H. + * s/hpux10-20.h (NEED_BSDTTY): Remove. + * s/aix4-2.h (NEED_UNISTD_H): Remove. + * systty.h: Simplify conditionals for including <sys/bsdtty.h>, + <sys/ptyio.h> and <unistd.h>. + * emacs.c (main): Remove NO_DIR_LIBRARY conditional, unused. * Makefile.in (STARTFILES): Conditionally define to make the usage clear.
--- a/src/s/aix4-2.h Thu May 06 12:40:02 2010 -0700 +++ b/src/s/aix4-2.h Thu May 06 12:46:47 2010 -0700 @@ -109,9 +109,6 @@ It may not have been needed in certain earlier versions. */ #define HAVE_TCATTR -/* Include unistd.h, even though we don't define POSIX. */ -#define NEED_UNISTD_H - /* AIX doesn't define this. */ #define unix 1
--- a/src/s/hpux10-20.h Thu May 06 12:40:02 2010 -0700 +++ b/src/s/hpux10-20.h Thu May 06 12:46:47 2010 -0700 @@ -91,9 +91,6 @@ #define UNEXEC unexhp9k800.o -/* Include the file bsdtty.h, since this machine has job control. */ -#define NEED_BSDTTY - /* This is how to get the device name of the tty end of a pty. */ #define PTY_TTY_NAME_SPRINTF \ sprintf (pty_name, "/dev/pty/tty%c%x", c, i);
--- a/src/systty.h Thu May 06 12:40:02 2010 -0700 +++ b/src/systty.h Thu May 06 12:46:47 2010 -0700 @@ -51,11 +51,8 @@ #include <termios.h> #endif -#ifdef NEED_BSDTTY +#ifdef HPUX #include <sys/bsdtty.h> -#endif - -#if defined (HPUX) && defined (HAVE_PTYS) #include <sys/ptyio.h> #endif @@ -63,7 +60,7 @@ #include <sys/pty.h> #endif /* AIX */ -#if (defined (POSIX) || defined (NEED_UNISTD_H)) && defined (HAVE_UNISTD_H) +#ifdef HAVE_UNISTD_H #include <unistd.h> #endif