===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- src/usr.bin/tmux/tmux.c	2009/07/29 05:36:53	1.22
+++ src/usr.bin/tmux/tmux.c	2009/07/29 14:17:26	1.23
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.22 2009/07/29 05:36:53 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.23 2009/07/29 14:17:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -57,8 +57,8 @@
 
 __dead void	 usage(void);
 char 		*makesockpath(const char *);
-int		 prepare_unlock(enum hdrtype *, void **, size_t *, int);
-int		 prepare_cmd(enum hdrtype *, void **, size_t *, int, char **);
+int		 prepare_unlock(enum msgtype *, void **, size_t *, int);
+int		 prepare_cmd(enum msgtype *, void **, size_t *, int, char **);
 
 __dead void
 usage(void)
@@ -203,7 +203,7 @@
 }
 
 int
-prepare_unlock(enum hdrtype *msg, void **buf, size_t *len, int argc)
+prepare_unlock(enum msgtype *msg, void **buf, size_t *len, int argc)
 {
 	static struct msg_unlock_data	 unlockdata;
 	char				*pass;
@@ -232,7 +232,7 @@
 }
 
 int
-prepare_cmd(enum hdrtype *msg, void **buf, size_t *len, int argc, char **argv)
+prepare_cmd(enum msgtype *msg, void **buf, size_t *len, int argc, char **argv)
 {
 	static struct msg_command_data	 cmddata;
 
@@ -258,7 +258,7 @@
 	struct cmd_list		*cmdlist;
  	struct cmd		*cmd;
 	struct pollfd	 	 pfd;
-	enum hdrtype		 msg;
+	enum msgtype		 msg;
 	struct hdr	 	 hdr;
 	struct passwd		*pw;
 	struct msg_print_data	 printdata;