Index: comm.c
--- comm.c.orig
+++ comm.c
@@ -58,10 +58,7 @@ static v3_winch v3w;
 /* Set up a drain of out-of-band data.
  */
 static void
-drain_user(user, len, func)
-  yuser *user;
-  int len;
-  void (*func)();
+drain_user(yuser *user, int len, void (*func)())
 {
     if(len > user->dbuf_size)
     {
@@ -76,10 +73,7 @@ drain_user(user, len, func)
 /* Send out-of-band data.
  */
 static void
-send_oob(fd, ptr, len)
-  int fd;
-  yaddr ptr;
-  int len;
+send_oob(int fd, yaddr ptr, int len)
 {
     ychar oob, size;
     static struct iovec iov[3];
@@ -114,8 +108,7 @@ send_oob(fd, ptr, len)
  * just now connected to.
  */
 static void
-send_import(to, from)
-  yuser *to, *from;
+send_import(yuser *to, yuser *from)
 {
     if(to->remote.vmajor > 2)
     {
@@ -138,8 +131,7 @@ send_import(to, from)
 /* Tell another ytalk connection to connect to a user.
  */
 static void
-send_accept(to, from)
-  yuser *to, *from;
+send_accept(yuser *to, yuser *from)
 {
     if(to->remote.vmajor > 2)
     {
@@ -162,9 +154,7 @@ send_accept(to, from)
 /* Process a Ytalk version 2.? data packet.
  */
 static void
-v2_process(user, pack)
-  yuser *user;
-  v2_pack *pack;
+v2_process(yuser *user, v2_pack *pack)
 {
     register yuser *u;
     ylong host_addr;
@@ -232,9 +222,7 @@ v2_process(user, pack)
 /* Process a Ytalk version 3.? data packet.
  */
 static void
-v3_process_pack(user, pack)
-  yuser *user;
-  v3_pack *pack;
+v3_process_pack(yuser *user, v3_pack *pack)
 {
     register yuser *u, *u2;
     ylong host_addr, pid;
@@ -306,9 +294,7 @@ v3_process_pack(user, pack)
  * them later.
  */
 static void
-v3_process_flags(user, pack)
-  yuser *user;
-  v3_flags *pack;
+v3_process_flags(yuser *user, v3_flags *pack)
 {
     switch(pack->code)
     {
@@ -324,9 +310,7 @@ v3_process_flags(user, pack)
 /* Process a Ytalk version 3.? winch packet.
  */
 static void
-v3_process_winch(user, pack)
-  yuser *user;
-  v3_winch *pack;
+v3_process_winch(yuser *user, v3_winch *pack)
 {
     switch(pack->code)
     {
@@ -355,9 +339,7 @@ v3_process_winch(user, pack)
  * function based on the type of packet.
  */
 static void
-v3_process(user, ptr)
-  yuser *user;
-  yaddr ptr;
+v3_process(yuser *user, yaddr ptr)
 {
     ychar *str;
 
@@ -387,8 +369,7 @@ v3_process(user, ptr)
  * data from the canonical input stream.
  */
 static void
-read_user(fd)
-  int fd;
+read_user(int fd)
 {
     register ychar *c, *p;
     register int rc;
@@ -521,8 +502,7 @@ read_user(fd)
 /* Initial Handshaking:  read the parameter pack from another ytalk user.
  */
 static void
-ytalk_user(fd)
-  int fd;
+ytalk_user(int fd)
 {
     register yuser *user, *u;
     u_short cols;
@@ -617,8 +597,7 @@ ytalk_user(fd)
  * this is another ytalk user.
  */
 static void
-connect_user(fd)
-  int fd;
+connect_user(int fd)
 {
     register yuser *user, *u;
 
@@ -685,12 +664,11 @@ connect_user(fd)
  * my edit keys.
  */
 static void
-contact_user(fd)
-  int fd;
+contact_user(int fd)
 {
     register yuser *user;
     register int n;
-    size_t socklen;
+    socklen_t socklen;
     struct sockaddr_in peer;
     char *hname;
 
@@ -742,8 +720,7 @@ contact_user(fd)
 /* Do a word wrap.
  */
 static int
-word_wrap(user)
-  register yuser *user;
+word_wrap(yuser *user)
 {
     register int i, x, bound;
     static ychar temp[20];
@@ -767,8 +744,7 @@ word_wrap(user)
  * to that instead of messing up his screen.
  */
 static int
-announce(user)
-  yuser *user;
+announce(yuser *user)
 {
     register int rc, fd;
 
@@ -818,9 +794,7 @@ announce(user)
 /* Invite a user into the conversation.
  */
 yuser *
-invite(name, send_announce)
-  register char *name;
-  int send_announce;
+invite(char *name, int send_announce)
 {
     register int rc;
     char *hisname, *hishost, *histty;
@@ -1012,8 +986,7 @@ house_clean()
 }
 
 void
-send_winch(user)
-  yuser *user;
+send_winch(yuser *user)
 {
     register yuser *u;
 
@@ -1067,10 +1040,7 @@ send_end_region()
  * users if the given user is either "me" or NULL.
  */
 void
-send_users(user, buf, len)
-  yuser *user;
-  ychar *buf;
-  register int len;
+send_users(yuser *user, ychar *buf, int len)
 {
     register ychar *o, *b;
     register yuser *u;
@@ -1112,10 +1082,7 @@ send_users(user, buf, len)
 /* Display user input.  Emulate ANSI.
  */
 void
-show_input(user, buf, len)
-  yuser *user;
-  register ychar *buf;
-  register int len;
+show_input(yuser *user, ychar *buf, int len)
 {
     if(user->got_esc)
     {
@@ -1341,10 +1308,7 @@ process_esc:
 /* Process keyboard input.
  */
 void
-my_input(user, buf, len)
-  yuser *user;
-  register ychar *buf;
-  int len;
+my_input(yuser *user, ychar *buf, int len)
 {
     register ychar *c;
     register int i;
@@ -1441,8 +1405,7 @@ my_input(user, buf, len)
 }
 
 void
-lock_flags(flags)
-  ylong flags;
+lock_flags(ylong flags)
 {
     register yuser *u;
 
