diff options
| author | Stefan Monnier | 2011-03-31 00:24:03 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2011-03-31 00:24:03 -0400 |
| commit | 40d83b412f584cc02e68d4eac8fd5e6eb769e2fe (patch) | |
| tree | b56f27a7e6d75a8c1fd27b00179a27b5efea0a32 /lib-src/emacsclient.c | |
| parent | f488fb6528738131ef41859e1f04125f2e50efce (diff) | |
| parent | 44f230aa043ebb222aa0876b44d70484d5dd38db (diff) | |
| download | emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.tar.gz emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.zip | |
Merge from trunk
Diffstat (limited to 'lib-src/emacsclient.c')
| -rw-r--r-- | lib-src/emacsclient.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index abc9aee37c1..737a8d88586 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c | |||
| @@ -1116,7 +1116,7 @@ socket_status (char *name) | |||
| 1116 | /* A signal handler that passes the signal to the Emacs process. | 1116 | /* A signal handler that passes the signal to the Emacs process. |
| 1117 | Useful for SIGWINCH. */ | 1117 | Useful for SIGWINCH. */ |
| 1118 | 1118 | ||
| 1119 | static SIGTYPE | 1119 | static void |
| 1120 | pass_signal_to_emacs (int signalnum) | 1120 | pass_signal_to_emacs (int signalnum) |
| 1121 | { | 1121 | { |
| 1122 | int old_errno = errno; | 1122 | int old_errno = errno; |
| @@ -1131,7 +1131,7 @@ pass_signal_to_emacs (int signalnum) | |||
| 1131 | /* Signal handler for SIGCONT; notify the Emacs process that it can | 1131 | /* Signal handler for SIGCONT; notify the Emacs process that it can |
| 1132 | now resume our tty frame. */ | 1132 | now resume our tty frame. */ |
| 1133 | 1133 | ||
| 1134 | static SIGTYPE | 1134 | static void |
| 1135 | handle_sigcont (int signalnum) | 1135 | handle_sigcont (int signalnum) |
| 1136 | { | 1136 | { |
| 1137 | int old_errno = errno; | 1137 | int old_errno = errno; |
| @@ -1157,7 +1157,7 @@ handle_sigcont (int signalnum) | |||
| 1157 | reality, we may get a SIGTSTP on C-z. Handling this signal and | 1157 | reality, we may get a SIGTSTP on C-z. Handling this signal and |
| 1158 | notifying Emacs about it should get things under control again. */ | 1158 | notifying Emacs about it should get things under control again. */ |
| 1159 | 1159 | ||
| 1160 | static SIGTYPE | 1160 | static void |
| 1161 | handle_sigtstp (int signalnum) | 1161 | handle_sigtstp (int signalnum) |
| 1162 | { | 1162 | { |
| 1163 | int old_errno = errno; | 1163 | int old_errno = errno; |