diff options
| -rw-r--r-- | compat.h | 6 | ||||
| -rw-r--r-- | compat/imsg-buffer.c | 2 | ||||
| -rw-r--r-- | compat/imsg.c | 2 | ||||
| -rw-r--r-- | compat/imsg.h | 2 | ||||
| -rwxr-xr-x | configure | 31 | ||||
| -rw-r--r-- | tmux.h | 3 |
6 files changed, 32 insertions, 14 deletions
@@ -1,4 +1,4 @@ -/* $Id: compat.h,v 1.8 2009-07-28 22:17:10 tcunha Exp $ */ +/* $Id: compat.h,v 1.9 2009-08-14 21:13:48 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -78,6 +78,10 @@ #include "compat/vis.h" #endif +#ifndef HAVE_IMSG +#include "compat/imsg.h" +#endif + #ifndef INFTIM #define INFTIM -1 #endif diff --git a/compat/imsg-buffer.c b/compat/imsg-buffer.c index ef380ab6..c20f63f8 100644 --- a/compat/imsg-buffer.c +++ b/compat/imsg-buffer.c @@ -26,7 +26,7 @@ #include <string.h> #include <unistd.h> -#include "imsg.h" +#include "tmux.h" int buf_realloc(struct buf *, size_t); void buf_enqueue(struct msgbuf *, struct buf *); diff --git a/compat/imsg.c b/compat/imsg.c index 4ba37f42..a74c0694 100644 --- a/compat/imsg.c +++ b/compat/imsg.c @@ -26,7 +26,7 @@ #include <string.h> #include <unistd.h> -#include "imsg.h" +#include "tmux.h" int imsg_get_fd(struct imsgbuf *); diff --git a/compat/imsg.h b/compat/imsg.h index 329904a1..4318463b 100644 --- a/compat/imsg.h +++ b/compat/imsg.h @@ -18,7 +18,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/tree.h> +#include "tmux.h" #define READ_BUF_SIZE 65535 #define IMSG_HEADER_SIZE sizeof(struct imsg_hdr) @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: configure,v 1.22 2009-08-09 15:53:02 tcunha Exp $ +# $Id: configure,v 1.23 2009-08-14 21:13:48 tcunha Exp $ TMUX_PLATFORM=${TMUX_PLATFORM:-`uname -s`} @@ -18,6 +18,7 @@ cat <<EOF >>$CONFIG_H #undef HAVE_FGETLN #undef HAVE_FORKPTY #undef HAVE_GETOPT +#undef HAVE_IMSG #undef HAVE_LIBUTIL_H #undef HAVE_PATHS_H #undef HAVE_POLL @@ -59,7 +60,9 @@ case $TMUX_PLATFORM in EOF cat <<EOF >>$CONFIG_MK LIBS+= -lcurses -lutil -SRCS+= osdep-openbsd.c +SRCS+= osdep-openbsd.c \ + compat/imsg-buffer.c \ + compat/imsg.c EOF ;; # ------------------------------------------------------------------------------ @@ -84,7 +87,9 @@ SRCS+= osdep-linux.c \ compat/strtonum.c \ compat/getopt.c \ compat/vis.c \ - compat/unvis.c + compat/unvis.c \ + compat/imsg-buffer.c \ + compat/imsg.c EOF ;; # ------------------------------------------------------------------------------ @@ -106,7 +111,9 @@ SRCS+= osdep-unknown.c \ compat/fgetln.c \ compat/getopt.c \ compat/vis.c \ - compat/unvis.c + compat/unvis.c \ + compat/imsg-buffer.c \ + compat/imsg.c EOF ;; # ------------------------------------------------------------------------------ @@ -134,7 +141,9 @@ SRCS+= osdep-unknown.c \ compat/strcasestr.c \ compat/strtonum.c \ compat/vis.c \ - compat/unvis.c + compat/unvis.c \ + compat/imsg-buffer.c \ + compat/imsg.c EOF ;; # ------------------------------------------------------------------------------ @@ -158,7 +167,9 @@ SRCS+= osdep-darwin.c \ compat/bsd-poll.c \ compat/strtonum.c \ compat/vis.c \ - compat/unvis.c + compat/unvis.c \ + compat/imsg-buffer.c \ + compat/imsg.c EOF ;; # ------------------------------------------------------------------------------ @@ -182,7 +193,9 @@ EOF EOF cat <<EOF >>$CONFIG_MK LIBS+= -lcurses -lcrypt -lutil -SRCS+= osdep-freebsd.c +SRCS+= osdep-freebsd.c \ + compat/imsg-buffer.c \ + compat/imsg.c EOF ;; # ------------------------------------------------------------------------------ @@ -208,7 +221,9 @@ CPPFLAGS+= -I/usr/pkg/include LDFLAGS+= -L/usr/pkg/lib LIBS+= -lncurses -lcrypt -lutil SRCS+= osdep-netbsd.c \ - compat/strtonum.c + compat/strtonum.c \ + compat/imsg-buffer.c \ + compat/imsg.c EOF ;; # ------------------------------------------------------------------------------ @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.410 2009-08-14 21:04:04 tcunha Exp $ */ +/* $Id: tmux.h,v 1.411 2009-08-14 21:13:48 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -35,7 +35,6 @@ #include <termios.h> #include "array.h" -#include "imsg.h" #include "compat.h" |