extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2024-12-24 07:38:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust imsg changes to the portable version due to OpenBSD patchset 243.

Browse Source
This commit is contained in:
Tiago Cunha 2009-08-14 21:13:48 +00:00
parent a9b6bfdddd
commit b402cef338
6 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compat.h
View File

@ -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> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -78,6 +78,10 @@
#include "compat/vis.h" #include "compat/vis.h"
#endif #endif
#ifndef HAVE_IMSG
#include "compat/imsg.h"
#endif
#ifndef INFTIM #ifndef INFTIM
#define INFTIM -1 #define INFTIM -1
#endif #endif

2
compat/imsg-buffer.c
View File

@ -26,7 +26,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "imsg.h" #include "tmux.h"
int buf_realloc(struct buf *, size_t); int buf_realloc(struct buf *, size_t);
void buf_enqueue(struct msgbuf *, struct buf *); void buf_enqueue(struct msgbuf *, struct buf *);

2
compat/imsg.c
View File

@ -26,7 +26,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "imsg.h" #include "tmux.h"
int imsg_get_fd(struct imsgbuf *); int imsg_get_fd(struct imsgbuf *);

2
compat/imsg.h
View File

@ -18,7 +18,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#include <sys/tree.h> #include "tmux.h"
#define READ_BUF_SIZE 65535 #define READ_BUF_SIZE 65535
#define IMSG_HEADER_SIZE sizeof(struct imsg_hdr) #define IMSG_HEADER_SIZE sizeof(struct imsg_hdr)

31
configure vendored
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/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`} TMUX_PLATFORM=${TMUX_PLATFORM:-`uname -s`}
@ -18,6 +18,7 @@ cat <<EOF >>$CONFIG_H
#undef HAVE_FGETLN #undef HAVE_FGETLN
#undef HAVE_FORKPTY #undef HAVE_FORKPTY
#undef HAVE_GETOPT #undef HAVE_GETOPT
#undef HAVE_IMSG
#undef HAVE_LIBUTIL_H #undef HAVE_LIBUTIL_H
#undef HAVE_PATHS_H #undef HAVE_PATHS_H
#undef HAVE_POLL #undef HAVE_POLL
@ -59,7 +60,9 @@ case $TMUX_PLATFORM in
EOF EOF
cat <<EOF >>$CONFIG_MK cat <<EOF >>$CONFIG_MK
LIBS+= -lcurses -lutil LIBS+= -lcurses -lutil
SRCS+= osdep-openbsd.c SRCS+= osdep-openbsd.c \
compat/imsg-buffer.c \
compat/imsg.c
EOF EOF
;; ;;
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@ -84,7 +87,9 @@ SRCS+= osdep-linux.c \
compat/strtonum.c \ compat/strtonum.c \
compat/getopt.c \ compat/getopt.c \
compat/vis.c \ compat/vis.c \
compat/unvis.c compat/unvis.c \
compat/imsg-buffer.c \
compat/imsg.c
EOF EOF
;; ;;
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@ -106,7 +111,9 @@ SRCS+= osdep-unknown.c \
compat/fgetln.c \ compat/fgetln.c \
compat/getopt.c \ compat/getopt.c \
compat/vis.c \ compat/vis.c \
compat/unvis.c compat/unvis.c \
compat/imsg-buffer.c \
compat/imsg.c
EOF EOF
;; ;;
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@ -134,7 +141,9 @@ SRCS+= osdep-unknown.c \
compat/strcasestr.c \ compat/strcasestr.c \
compat/strtonum.c \ compat/strtonum.c \
compat/vis.c \ compat/vis.c \
compat/unvis.c compat/unvis.c \
compat/imsg-buffer.c \
compat/imsg.c
EOF EOF
;; ;;
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@ -158,7 +167,9 @@ SRCS+= osdep-darwin.c \
compat/bsd-poll.c \ compat/bsd-poll.c \
compat/strtonum.c \ compat/strtonum.c \
compat/vis.c \ compat/vis.c \
compat/unvis.c compat/unvis.c \
compat/imsg-buffer.c \
compat/imsg.c
EOF EOF
;; ;;
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@ -182,7 +193,9 @@ EOF
EOF EOF
cat <<EOF >>$CONFIG_MK cat <<EOF >>$CONFIG_MK
LIBS+= -lcurses -lcrypt -lutil LIBS+= -lcurses -lcrypt -lutil
SRCS+= osdep-freebsd.c SRCS+= osdep-freebsd.c \
compat/imsg-buffer.c \
compat/imsg.c
EOF EOF
;; ;;
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@ -208,7 +221,9 @@ CPPFLAGS+= -I/usr/pkg/include
LDFLAGS+= -L/usr/pkg/lib LDFLAGS+= -L/usr/pkg/lib
LIBS+= -lncurses -lcrypt -lutil LIBS+= -lncurses -lcrypt -lutil
SRCS+= osdep-netbsd.c \ SRCS+= osdep-netbsd.c \
compat/strtonum.c compat/strtonum.c \
compat/imsg-buffer.c \
compat/imsg.c
EOF EOF
;; ;;
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

3
tmux.h
View File

@ -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> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -35,7 +35,6 @@
#include <termios.h> #include <termios.h>
#include "array.h" #include "array.h"
#include "imsg.h"
#include "compat.h" #include "compat.h"