Support dfly, from joshe.

This commit is contained in:
Nicholas Marriott 2008-11-27 18:55:47 +00:00
parent 8bef3adc83
commit 8f163b8caa
4 changed files with 16 additions and 11 deletions

10
CHANGES
View File

@ -1,3 +1,11 @@
27 November 2008
* Tweaks to support Dragonfly.
17 November 2008
* tmux 0.5 released.
16 November 2008 16 November 2008
* New window option: "utf8"; this must be on (it is off by default) for UTF-8 * New window option: "utf8"; this must be on (it is off by default) for UTF-8
@ -707,4 +715,4 @@
(including mutt, emacs). No status bar yet and no key remapping or other (including mutt, emacs). No status bar yet and no key remapping or other
customisation. customisation.
$Id: CHANGES,v 1.167 2008-11-16 13:28:59 nicm Exp $ $Id: CHANGES,v 1.168 2008-11-27 18:55:47 nicm Exp $

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.76 2008-11-23 19:38:12 nicm Exp $ # $Id: Makefile,v 1.77 2008-11-27 18:55:47 nicm Exp $
.SUFFIXES: .c .o .y .h .SUFFIXES: .c .o .y .h
.PHONY: clean update-index.html upload-index.html .PHONY: clean update-index.html upload-index.html
@ -71,8 +71,8 @@ LDFLAGS+= -pg
.endif .endif
LIBS+= -lutil -lncurses LIBS+= -lutil -lncurses
# FreeBSD # FreeBSD and DragonFly
.if ${OS} == "FreeBSD" .if ${OS} == "FreeBSD" || ${OS} == "DragonFly"
CFLAGS+= -DUSE_LIBUTIL_H CFLAGS+= -DUSE_LIBUTIL_H
.endif .endif

5
tmux.c
View File

@ -1,4 +1,4 @@
/* $Id: tmux.c,v 1.80 2008-11-16 13:28:59 nicm Exp $ */ /* $Id: tmux.c,v 1.81 2008-11-27 18:55:47 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -34,7 +34,8 @@
#include "tmux.h" #include "tmux.h"
#ifdef DEBUG #ifdef DEBUG
#ifdef __OpenBSD__ /* DragonFly uses an OpenBSD-like malloc() since 1.6 */
#if defined(__OpenBSD__) || defined(__DragonFly__)
const char *malloc_options = "AFGJPX"; const char *malloc_options = "AFGJPX";
#endif #endif
#ifdef __FreeBSD__ #ifdef __FreeBSD__

6
tty.c
View File

@ -1,4 +1,4 @@
/* $Id: tty.c,v 1.51 2008-11-16 13:28:59 nicm Exp $ */ /* $Id: tty.c,v 1.52 2008-11-27 18:55:47 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -301,10 +301,6 @@ tty_find_term(char *name, int fd, char **cause)
xasprintf(cause, "carriage_return missing"); xasprintf(cause, "carriage_return missing");
goto error; goto error;
} }
if (cursor_left == NULL) {
xasprintf(cause, "cursor_left missing");
goto error;
}
if (parm_up_cursor == NULL && cursor_up == NULL) { if (parm_up_cursor == NULL && cursor_up == NULL) {
xasprintf(cause, "parm_up_cursor missing"); xasprintf(cause, "parm_up_cursor missing");
goto error; goto error;