Mercurial > emacs
changeset 97119:b57392641da7
* 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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 30 Jul 2008 15:14:07 +0000 |
| parents | 48b4d1b43ea2 |
| children | d3b0c34318bb |
| files | ChangeLog configure.in src/ChangeLog src/config.in src/sysdep.c src/systty.h |
| diffstat | 6 files changed, 28 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jul 30 14:59:08 2008 +0000 +++ b/ChangeLog Wed Jul 30 15:14:07 2008 +0000 @@ -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.
--- a/configure.in Wed Jul 30 14:59:08 2008 +0000 +++ b/configure.in Wed Jul 30 15:14:07 2008 +0000 @@ -2561,9 +2561,6 @@ /* 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. */
--- a/src/ChangeLog Wed Jul 30 14:59:08 2008 +0000 +++ b/src/ChangeLog Wed Jul 30 15:14:07 2008 +0000 @@ -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.
--- a/src/config.in Wed Jul 30 14:59:08 2008 +0000 +++ b/src/config.in Wed Jul 30 15:14:07 2008 +0000 @@ -221,6 +221,9 @@ /* 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 @@ /* 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. */
--- a/src/sysdep.c Wed Jul 30 14:59:08 2008 +0000 +++ b/src/sysdep.c Wed Jul 30 15:14:07 2008 +0000 @@ -1213,7 +1213,7 @@ 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 @@ #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 @@ return rtnval; } -#endif /* BROKEN_CLOSEDIR or not HAVE_CLOSEDIR */ +#endif /* not HAVE_CLOSEDIR */ #endif /* SYSV_SYSTEM_DIR */ #ifdef NONSYSTEM_DIR_LIBRARY
--- a/src/systty.h Wed Jul 30 14:59:08 2008 +0000 +++ b/src/systty.h Wed Jul 30 15:14:07 2008 +0000 @@ -174,42 +174,34 @@ 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. */