* systty.h (sensemode): Remove empty #if. Remove reference to

BSD_TERMIOS, unused.

* sysdep.c: Remove reference to DGUX.
(closedir): Remove reference to BROKEN_CLOSEDIR, unused.

* config.in: Regenerate.

* configure.in (DO_BLOCK_INPUT): Remove, unused.

diff --git a/ChangeLog b/ChangeLog
index e939d6bc9a7d2e90be9fe5b9d2db64bf454e5e9d..23aad3b5109ce10132f2ed260b3a6b4b32a66901 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-30  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * configure.in (DO_BLOCK_INPUT): Remove, unused.
+
 2008-07-29  Chong Yidong  <cyd@stupidchicken.com>
 
        * info/dir (File): Add mairix-el.

diff --git a/configure.in b/configure.in
index 4e5456389d89dd0f9fd47bc367ba1c98fa272efd..94c30e53e28e71edbd57b4732893718193847f4e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2561,9 +2561,6 @@ AH_BOTTOM([
 /* Turned on June 1996 supposing nobody will mind it.  */
 #define AMPERSAND_FULL_NAME
 
-/* We have blockinput.h.  */
-#define DO_BLOCK_INPUT
-
 /* Define HAVE_SOUND if we have sound support.  We know it works
    and compiles only on the specified platforms.   For others,
    it probably doesn't make sense to try.  */

diff --git a/src/ChangeLog b/src/ChangeLog
index b4eea07733fc8ee73dc8a6d022de529c3478df00..eb38a06c787285069236a19c05e32d1596e5b980 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2008-07-30  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * systty.h (sensemode): Remove empty #if.  Remove reference to
+       BSD_TERMIOS, unused.
+
+       * sysdep.c: Remove reference to DGUX.
+       (closedir): Remove reference to BROKEN_CLOSEDIR, unused.
+
+       * config.in: Regenerate.
+
 2008-07-30  Jason Rumney  <jasonr@gnu.org>
 
         * w32uniscribe.c (uniscribe_encode_char): Fix glyph buffer size.

diff --git a/src/config.in b/src/config.in
index 46e1f93d2b3cc4017f75fdfe6c4ed79d35366fcd..5b78d3be6426e9d985f35aa3a43f3d54ff8961fc 100644 (file)
--- a/src/config.in
+++ b/src/config.in
@@ -221,6 +221,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `getpt' function. */
 #undef HAVE_GETPT
 
+/* Define to 1 if you have the `getrlimit' function. */
+#undef HAVE_GETRLIMIT
+
 /* Define to 1 if you have the `getrusage' function. */
 #undef HAVE_GETRUSAGE
 
@@ -996,9 +999,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Turned on June 1996 supposing nobody will mind it.  */
 #define AMPERSAND_FULL_NAME
 
-/* We have blockinput.h.  */
-#define DO_BLOCK_INPUT
-
 /* Define HAVE_SOUND if we have sound support.  We know it works
    and compiles only on the specified platforms.   For others,
    it probably doesn't make sense to try.  */

diff --git a/src/sysdep.c b/src/sysdep.c
index c2e52a07f1b077191f6c4e8f9cfa06aa95278f49..6e0107dfe3f77cb351f6c0d0ec15aa7c0f24a25a 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1213,7 +1213,7 @@ int old_fcntl_owner[MAXDESC];
    but if so, this does no harm,
    and using the same name avoids wasting the other one's space.  */
 
-#if defined (USG) || defined (DGUX)
+#if defined (USG)
 unsigned char _sobuf[BUFSIZ+8];
 #else
 char _sobuf[BUFSIZ];
@@ -3273,11 +3273,10 @@ croak (badfunc)
 
 #include <dirent.h>
 
-#if defined (BROKEN_CLOSEDIR) || !defined (HAVE_CLOSEDIR)
+#if !defined (HAVE_CLOSEDIR)
 
 int
-closedir (dirp)
-     register DIR *dirp;              /* stream from opendir */
+closedir (DIR *dirp /* stream from opendir */)
 {
   int rtnval;
 
@@ -3293,7 +3292,7 @@ closedir (dirp)
 
   return rtnval;
 }
-#endif /* BROKEN_CLOSEDIR or not HAVE_CLOSEDIR */
+#endif /* not HAVE_CLOSEDIR */
 #endif /* SYSV_SYSTEM_DIR */
 
 #ifdef NONSYSTEM_DIR_LIBRARY

diff --git a/src/systty.h b/src/systty.h
index 580513a10801c8be8f7c7b377d2bfe3d8ba731f4..98f6ad493e6bd935dc4ec87b23a92a98c1c1c3ba 100644 (file)
--- a/src/systty.h
+++ b/src/systty.h
@@ -174,42 +174,34 @@ static struct sensemode {
    EMACS_SET_TTY_PGRP(int FD, int *PGID) sets the terminal FD's
    current process group to *PGID.  Return -1 if there is an error.  */
 
-#ifdef HPUX
 /* HPUX tty process group stuff doesn't work, says the anonymous voice
    from the past.  */
-#else
+#ifndef HPUX
 #ifdef TIOCGPGRP
 #define EMACS_HAVE_TTY_PGRP
 #else
 #ifdef HAVE_TERMIOS
 #define EMACS_HAVE_TTY_PGRP
-#endif
-#endif
-#endif
+#endif /* HAVE_TERMIOS */
+#endif /* TIOCGPGRP */
+#endif /* not HPUX */
 
 #ifdef EMACS_HAVE_TTY_PGRP
 
-#if defined (HAVE_TERMIOS) && ! defined (BSD_TERMIOS)
-
-#define EMACS_GET_TTY_PGRP(fd, pgid) (*(pgid) = tcgetpgrp ((fd)))
-#define EMACS_SET_TTY_PGRP(fd, pgid) (tcsetpgrp ((fd), *(pgid)))
-
-#else
 #ifdef TIOCSPGRP
 
 #define EMACS_GET_TTY_PGRP(fd, pgid) (ioctl ((fd), TIOCGPGRP, (pgid)))
 #define EMACS_SET_TTY_PGRP(fd, pgid) (ioctl ((fd), TIOCSPGRP, (pgid)))
 
-#endif
-#endif
+#endif /* TIOCSPGRP */
 
-#else
+#else /* not EMACS_SET_TTY_PGRP */
 
 /* Just ignore this for now and hope for the best */
 #define EMACS_GET_TTY_PGRP(fd, pgid) 0
 #define EMACS_SET_TTY_PGRP(fd, pgif) 0
 
-#endif
+#endif /* not EMACS_SET_TTY_PGRP */
 
 /* EMACS_GETPGRP (arg) returns the process group of the process.  */