FreeBSD's util.h is libutil.h.

3 files changed, 13 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 38312c75..5d24cfa6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.28 2007-10-19 11:10:34 nicm Exp $
+# $Id: Makefile,v 1.29 2007-10-19 20:47:09 nicm Exp $
 
 .SUFFIXES: .c .o .y .h
 .PHONY: clean
@@ -55,6 +55,11 @@ LDFLAGS+= -pg
 .endif
 LIBS+= -lutil -lncurses
 
+# FreeBSD
+.if ${OS} == "FreeBSD"
+CFLAGS+= -DUSE_LIBUTIL_H
+.endif
+
 OBJS= ${SRCS:S/.c/.o/:S/.y/.o/}
 
 CLEANFILES= ${PROG} *.o .depend *~ ${PROG}.core *.log
diff --git a/server.c b/server.c
index dfc96fc4..f0822f3e 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.28 2007-10-19 10:21:35 nicm Exp $ */
+/* $Id: server.c,v 1.29 2007-10-19 20:47:09 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -33,7 +33,6 @@
 #include <syslog.h>
 #include <termios.h>
 #include <unistd.h>
-#include <util.h>
 
 #include "tmux.h"
 
diff --git a/window.c b/window.c
index ec7d06a6..ff3530c9 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.19 2007-10-04 20:33:16 nicm Exp $ */
+/* $Id: window.c,v 1.20 2007-10-19 20:47:09 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -26,7 +26,12 @@
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
+
+#ifdef USE_LIBUTIL_H
+#include <libutil.h>
+#else
 #include <util.h>
+#endif
 
 #include "tmux.h"