diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2010-05-06 12:46:47 -0700 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2010-05-06 12:46:47 -0700 |
| commit | 2882364886562e5786f1b636c7660c1caaf6ba86 (patch) | |
| tree | 0796acf41a3c8243ccdc0a792e402e3571049bf0 /src | |
| parent | aca004303d7fe01ebe33b902b3dd45e21552175f (diff) | |
| download | emacs-2882364886562e5786f1b636c7660c1caaf6ba86.tar.gz | |
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>.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/s/aix4-2.h | 3 | ||||
| -rw-r--r-- | src/s/hpux10-20.h | 3 | ||||
| -rw-r--r-- | src/systty.h | 7 |
4 files changed, 8 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3c0270e1fc4..29cf56225d1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h index 0a36c8ff0df..bd327c7833e 100644 --- a/src/s/aix4-2.h +++ b/src/s/aix4-2.h @@ -109,9 +109,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 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 diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h index fe47b3b5645..320fa8b4d79 100644 --- a/src/s/hpux10-20.h +++ b/src/s/hpux10-20.h @@ -91,9 +91,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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); diff --git a/src/systty.h b/src/systty.h index 057f58f6064..fcc6cf81e51 100644 --- a/src/systty.h +++ b/src/systty.h @@ -51,11 +51,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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 |