--- a/lib-src/emacsclient.c	Mon Aug 13 08:47:56 2007 +0200
+++ b/lib-src/emacsclient.c	Mon Aug 13 08:48:16 2007 +0200
@@ -38,9 +38,8 @@
 #if !defined(HAVE_SOCKETS) && !defined(HAVE_SYSVIPC)
 #include <stdio.h>
 
-main (argc, argv)
-     int argc;
-     char **argv;
+int
+main (int argc, char *argv[])
 {
   fprintf (stderr, "%s: Sorry, the Emacs server is supported only\n",
 	   argv[0]);
@@ -63,10 +62,8 @@
 extern char *strerror ();
 extern int errno;
 
-void
-main (argc, argv)
-     int argc;
-     char **argv;
+int
+main (int argc, char *argv[])
 {
   char system_name[256];
   int s, i;
@@ -180,7 +177,7 @@
   while ((str = fgets (string, BUFSIZ, out)))
     printf ("%s", str);
   
-  exit (0);
+  return 0;
 }
 
 #else /* This is the SYSV IPC section */
@@ -195,10 +192,8 @@
 char *getcwd (), *getenv ();
 #endif
 
-void
-main (argc, argv)
-     int argc;
-     char **argv;
+int
+main (int argc, char *argv[])
 {
   int s;
   key_t key;
@@ -335,8 +330,7 @@
 
 #ifndef HAVE_STRERROR
 char *
-strerror (errnum)
-     int errnum;
+strerror (int errnum)
 {
   extern char *sys_errlist[];
   extern int sys_nerr;