diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-05-13 23:29:45 +0000 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-05-13 23:29:45 +0000 |
commit | f1bd3807aed0c2d3db49b49b74a62349e6d2ee54 (patch) | |
tree | 5b5fbe178a050a522893c9a0a656f9fc4ed73074 | |
parent | c8cf438d44f7a4cd6700dbf9621329bffd960bf5 (diff) | |
download | rtmux-f1bd3807aed0c2d3db49b49b74a62349e6d2ee54.tar.gz rtmux-f1bd3807aed0c2d3db49b49b74a62349e6d2ee54.tar.bz2 rtmux-f1bd3807aed0c2d3db49b49b74a62349e6d2ee54.zip |
Everything supported has working vsnprintf.
-rwxr-xr-x | configure | 9 | ||||
-rw-r--r-- | status.c | 13 |
2 files changed, 2 insertions, 20 deletions
@@ -1,5 +1,5 @@ #!/bin/sh -# $Id: configure,v 1.1 2009-05-13 23:27:00 nicm Exp $ +# $Id: configure,v 1.2 2009-05-13 23:29:45 nicm Exp $ CONFIG_H=config.h CONFIG_MK=config.mk @@ -26,7 +26,6 @@ case `uname` in #define HAVE_STRTONUM #define HAVE_TREE_H #define HAVE_UTIL_H -#define HAVE_VSNPRINTF #define HAVE_VSYSLOG EOF cat <<EOF >>$CONFIG_MK @@ -43,7 +42,6 @@ EOF #define HAVE_POLL #define HAVE_PROGNAME #define HAVE_PTY_H -#define HAVE_VSNPRINTF #define HAVE_VSYSLOG EOF cat <<EOF >>$CONFIG_MK @@ -61,7 +59,6 @@ EOF AIX) cat <<EOF >>$CONFIG_H #define HAVE_DAEMON -#define HAVE_VSNPRINTF EOF cat <<EOF >>$CONFIG_MK CPPFLAGS+= -I/usr/local/include/ncurses @@ -83,7 +80,6 @@ EOF #define HAVE_POLL #define HAVE_STRLCAT #define HAVE_STRLCPY -#define HAVE_VSNPRINTF #define HAVE_VSYSLOG EOF cat <<EOF >>$CONFIG_MK @@ -112,7 +108,6 @@ EOF #define HAVE_STRLCAT #define HAVE_STRLCPY #define HAVE_UTIL_H -#define HAVE_VSNPRINTF #define HAVE_VSYSLOG EOF cat <<EOF >>$CONFIG_MK @@ -137,7 +132,6 @@ EOF #define HAVE_STRLCPY #define HAVE_STRTONUM #define HAVE_LIBUTIL_H -#define HAVE_VSNPRINTF #define HAVE_VSYSLOG EOF cat <<EOF >>$CONFIG_MK @@ -161,7 +155,6 @@ EOF #define HAVE_STRLCPY #define HAVE_TREE_H #define HAVE_UTIL_H -#define HAVE_VSNPRINTF #define HAVE_VSYSLOG EOF cat <<EOF >>$CONFIG_MK @@ -1,4 +1,4 @@ -/* $Id: status.c,v 1.78 2009-05-13 23:27:00 nicm Exp $ */ +/* $Id: status.c,v 1.79 2009-05-13 23:29:45 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -439,18 +439,7 @@ out: size_t status_width(struct winlink *wl) { -#ifdef HAVE_VSNPRINTF return (xsnprintf(NULL, 0, "%d:%s ", wl->idx, wl->window->name)); -#else - char *s; - size_t n; - - xasprintf(&s, "%d:%s ", wl->idx, wl->window->name); - n = strlen(s); - xfree(s); - - return (n); -#endif } char * |