Merge from mainline.

2 files changed, 7 insertions, 3 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 672fe8c8541..f594efa588c 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-27  Glenn Morris  <rgm@gnu.org>
+
+        * emacsclient.c: Replace SIGTYPE with void.
+
 2011-03-23  Juanma Barranquero  <lekktu@gmail.com>
 
         * ntlib.c: Include <ctype.h>.
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)
 /* A signal handler that passes the signal to the Emacs process.
    Useful for SIGWINCH.  */
 
-static SIGTYPE
+static void
 pass_signal_to_emacs (int signalnum)
 {
   int old_errno = errno;
@@ -1131,7 +1131,7 @@ pass_signal_to_emacs (int signalnum)
 /* Signal handler for SIGCONT; notify the Emacs process that it can
    now resume our tty frame.  */
 
-static SIGTYPE
+static void
 handle_sigcont (int signalnum)
 {
   int old_errno = errno;
@@ -1157,7 +1157,7 @@ handle_sigcont (int signalnum)
    reality, we may get a SIGTSTP on C-z.  Handling this signal and
    notifying Emacs about it should get things under control again. */
 
-static SIGTYPE
+static void
 handle_sigtstp (int signalnum)
 {
   int old_errno = errno;