diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-17 18:15:59 +0100 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-17 18:15:59 +0100 |
| commit | 2d0b60a90f4ac8907de22efa11bdef96b6783a94 (patch) | |
| tree | 2d3259d4d84ba02af67cd2cb191b2c623b6050f8 /tools/xenstat/xentop | |
| parent | cf1aa17df0aa162fa0004bd99a6b2d36b1fb27cf (diff) | |
| download | xen-2d0b60a90f4ac8907de22efa11bdef96b6783a94.tar.gz xen-2d0b60a90f4ac8907de22efa11bdef96b6783a94.tar.bz2 xen-2d0b60a90f4ac8907de22efa11bdef96b6783a94.zip | |
[SOLARIS] A couple of simple compile fixes for tools/ on Solaris.
Signed-off-by: John Levon <john.levon@sun.com>
Diffstat (limited to 'tools/xenstat/xentop')
| -rw-r--r-- | tools/xenstat/xentop/Makefile | 3 | ||||
| -rw-r--r-- | tools/xenstat/xentop/xentop.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index b97485f5d6..2248bfb3c3 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -25,7 +25,7 @@ sbindir=$(prefix)/sbin CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT) LDFLAGS += -L$(XEN_LIBXENSTAT) -LDLIBS += -lxenstat -lncurses $(SOCKET_LIBS) +LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS) .PHONY: all all: xentop @@ -33,6 +33,7 @@ all: xentop .PHONY: install install: xentop xentop.1 $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop + $(INSTALL_DIR) $(DESTDIR)$(man1dir) $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1 endif diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c index b808bfa497..271f4b2bf7 100644 --- a/tools/xenstat/xentop/xentop.c +++ b/tools/xenstat/xentop/xentop.c @@ -23,6 +23,7 @@ #include <errno.h> #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include <string.h> #include <sys/time.h> #include <time.h> @@ -266,7 +267,7 @@ static void print(const char *fmt, ...) if (!batch) { if((current_row() < lines()-1)) { va_start(args, fmt); - vw_printw(stdscr, fmt, args); + vwprintw(stdscr, (char *)fmt, args); va_end(args); } } else { @@ -280,7 +281,7 @@ static void print(const char *fmt, ...) static void attr_addstr(int attr, const char *str) { attron(attr); - addstr(str); + addstr((char *)str); attroff(attr); } @@ -1035,7 +1036,9 @@ int main(int argc, char **argv) nonl(); keypad(stdscr, TRUE); halfdelay(5); +#ifndef __sun__ use_default_colors(); +#endif init_pair(1, -1, COLOR_YELLOW); do { |