[Emacs-diffs] /srv/bzr/emacs/trunk r100169: Remove NEED_BSDTTY and NEED_UNISTD_H.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 100169
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Thu 2010-05-06 12:46:47 -0700
message:
  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>.
modified:
  src/ChangeLog
  src/s/aix4-2.h
  src/s/hpux10-20.h
  src/systty.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-06 19:40:02 +0000
+++ b/src/ChangeLog     2010-05-06 19:46:47 +0000
@@ -1,5 +1,11 @@
 2010-05-06  Dan Nicolaescu  <address@hidden>
 
+       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.

=== modified file 'src/s/aix4-2.h'
--- a/src/s/aix4-2.h    2010-05-04 04:00:10 +0000
+++ b/src/s/aix4-2.h    2010-05-06 19:46:47 +0000
@@ -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
 

=== modified file 'src/s/hpux10-20.h'
--- a/src/s/hpux10-20.h 2010-05-04 02:51:49 +0000
+++ b/src/s/hpux10-20.h 2010-05-06 19:46:47 +0000
@@ -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);

=== modified file 'src/systty.h'
--- a/src/systty.h      2010-01-13 08:35:10 +0000
+++ b/src/systty.h      2010-05-06 19:46:47 +0000
@@ -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