aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-04-16 15:06:00 -0700
committerPaul Eggert2011-04-16 15:06:00 -0700
commit5c1ccb01541c438e596ce2d819d703d67bab25c0 (patch)
tree0c81820155f9ede7880ca4e3194ba0d1b61dcb26
parent006c5daa682b5d951fb4a0d7945d45a722f0690b (diff)
downloademacs-5c1ccb01541c438e596ce2d819d703d67bab25c0.tar.gz
emacs-5c1ccb01541c438e596ce2d819d703d67bab25c0.zip
* s/sol2-6.h, s/unixware.h (PTY_TTY_NAME_SPRINTF): Protoize decl.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/s/sol2-6.h3
-rw-r--r--src/s/unixware.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e44331dcd4d..61509caf744 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-04-16 Paul Eggert <eggert@cs.ucla.edu> 12011-04-16 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * s/sol2-6.h, s/unixware.h (PTY_TTY_NAME_SPRINTF): Protoize decl.
4
3 * process.c (keyboard_bit_set): Define only if SIGIO. 5 * process.c (keyboard_bit_set): Define only if SIGIO.
4 (send_process_trap): Mark it with NO_RETURN if it doesn't return. 6 (send_process_trap): Mark it with NO_RETURN if it doesn't return.
5 (send_process): Repair possible setjmp clobbering. 7 (send_process): Repair possible setjmp clobbering.
diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
index 4c6fd3e2f9b..3d9bd6ddafc 100644
--- a/src/s/sol2-6.h
+++ b/src/s/sol2-6.h
@@ -44,7 +44,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
44 44
45#define PTY_TTY_NAME_SPRINTF \ 45#define PTY_TTY_NAME_SPRINTF \
46 { \ 46 { \
47 char *ptsname (), *ptyname; \ 47 char *ptsname (int), *ptyname; \
48 \ 48 \
49 sigblock (sigmask (SIGCLD)); \ 49 sigblock (sigmask (SIGCLD)); \
50 if (grantpt (fd) == -1) \ 50 if (grantpt (fd) == -1) \
@@ -60,4 +60,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
60 60
61#define GC_SETJMP_WORKS 1 61#define GC_SETJMP_WORKS 1
62#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS 62#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
63
diff --git a/src/s/unixware.h b/src/s/unixware.h
index 407282ff78c..8fe28625dd4 100644
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -35,7 +35,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
35 within, it should be caught after sigrelse(2). */ 35 within, it should be caught after sigrelse(2). */
36#define PTY_TTY_NAME_SPRINTF \ 36#define PTY_TTY_NAME_SPRINTF \
37 { \ 37 { \
38 char *ptsname(), *ptyname; \ 38 char *ptsname (int), *ptyname; \
39 \ 39 \
40 sigblock(sigmask(SIGCLD)); \ 40 sigblock(sigmask(SIGCLD)); \
41 if (grantpt(fd) == -1) \ 41 if (grantpt(fd) == -1) \