circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-15 05:09:04 +00:00
Code Issues Projects Releases Wiki Activity

Tweak tparm() to make Solaris' backward userland happy and remove the -I mess

Browse Source 
in configure which tried to deal with the fallout from their horrible package
management.
This commit is contained in:
Nicholas Marriott 2009-09-22 19:20:08 +00:00
parent df7b68480c
commit 2c9d4dfdd4
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# $Id: configure,v 1.38 2009-09-20 17:51:54 nicm Exp $ # $Id: configure,v 1.39 2009-09-22 19:20:08 nicm Exp $
TMUX_PLATFORM=${TMUX_PLATFORM:-`uname -s`} TMUX_PLATFORM=${TMUX_PLATFORM:-`uname -s`}
@ -139,13 +139,7 @@ EOF
#define HAVE_STRLCPY #define HAVE_STRLCPY
EOF EOF
cat <<EOF >>$CONFIG_MK cat <<EOF >>$CONFIG_MK
CPPFLAGS+= -I/usr/local/include/ncurses \
-I/opt/csw/include -I/opt/csw/include/ncurses \
-I/opt/sfw/include -I/opt/sfw/include/ncurses
CFLAGS+= -D_XPG4_2 -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS CFLAGS+= -D_XPG4_2 -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
LDFLAGS+= -L/usr/gnu/lib \
-L/opt/csw/lib \
-L/opt/sfw/lib
LIBS+= -lcurses -lsocket -lnsl LIBS+= -lcurses -lsocket -lnsl
SRCS+= osdep-unknown.c \ SRCS+= osdep-unknown.c \
compat/asprintf.c \ compat/asprintf.c \

6
tty-term.c
View File

@ -1,4 +1,4 @@
/* $Id: tty-term.c,v 1.30 2009-08-23 11:50:39 nicm Exp $ */ /* $Id: tty-term.c,v 1.31 2009-09-22 19:20:08 nicm Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -417,13 +417,13 @@ tty_term_string(struct tty_term *term, enum tty_code_code code)
const char * const char *
tty_term_string1(struct tty_term *term, enum tty_code_code code, int a) tty_term_string1(struct tty_term *term, enum tty_code_code code, int a)
{ {
return (tparm((char *) tty_term_string(term, code), a)); return (tparm((char *) tty_term_string(term, code), a, 0, 0, 0, 0, 0, 0, 0, 0));
} }
const char * const char *
tty_term_string2(struct tty_term *term, enum tty_code_code code, int a, int b) tty_term_string2(struct tty_term *term, enum tty_code_code code, int a, int b)
{ {
return (tparm((char *) tty_term_string(term, code), a, b)); return (tparm((char *) tty_term_string(term, code), a, b, 0, 0, 0, 0, 0, 0, 0));
} }
int int