diff options
| author | Paul Eggert | 2011-04-16 14:57:28 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-16 14:57:28 -0700 |
| commit | efc736d31984b3c361db0bb28003db76df31d554 (patch) | |
| tree | 02185300f9c09a772684a5cfee69752c89046249 /src | |
| parent | 4e2fe2e61de8ca79587dad5563c847feadd10cdf (diff) | |
| download | emacs-efc736d31984b3c361db0bb28003db76df31d554.tar.gz emacs-efc736d31984b3c361db0bb28003db76df31d554.zip | |
* s/usg5-4-common.h (SETUP_SLAVE_PTY): Don't pass extra arg to 'fatal'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/s/usg5-4-common.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d7dc454c3dc..172fccc2dcf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-04-16 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-16 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * s/usg5-4-common.h (SETUP_SLAVE_PTY): Don't pass extra arg to 'fatal'. | ||
| 4 | |||
| 3 | * eval.c: Include <stdio.h>, for vsnprintf on non-GNU/Linux hosts. | 5 | * eval.c: Include <stdio.h>, for vsnprintf on non-GNU/Linux hosts. |
| 4 | 6 | ||
| 5 | * data.c (arith_error): Mark with NO_RETURN if it doesn't return. | 7 | * data.c (arith_error): Mark with NO_RETURN if it doesn't return. |
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h index 236f71e3007..e6d992d8f9c 100644 --- a/src/s/usg5-4-common.h +++ b/src/s/usg5-4-common.h | |||
| @@ -88,11 +88,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 88 | /* Push various streams modules onto a PTY channel. */ | 88 | /* Push various streams modules onto a PTY channel. */ |
| 89 | #define SETUP_SLAVE_PTY \ | 89 | #define SETUP_SLAVE_PTY \ |
| 90 | if (ioctl (xforkin, I_PUSH, "ptem") == -1) \ | 90 | if (ioctl (xforkin, I_PUSH, "ptem") == -1) \ |
| 91 | fatal ("ioctl I_PUSH ptem", errno); \ | 91 | fatal ("ioctl I_PUSH ptem"); \ |
| 92 | if (ioctl (xforkin, I_PUSH, "ldterm") == -1) \ | 92 | if (ioctl (xforkin, I_PUSH, "ldterm") == -1) \ |
| 93 | fatal ("ioctl I_PUSH ldterm", errno); \ | 93 | fatal ("ioctl I_PUSH ldterm"); \ |
| 94 | if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \ | 94 | if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \ |
| 95 | fatal ("ioctl I_PUSH ttcompat", errno); | 95 | fatal ("ioctl I_PUSH ttcompat"); |
| 96 | 96 | ||
| 97 | /* This definition was suggested for next release. So give it a try. */ | 97 | /* This definition was suggested for next release. So give it a try. */ |
| 98 | #define HAVE_SOCKETS | 98 | #define HAVE_SOCKETS |