mirror of
				https://github.com/tmux/tmux.git
				synced 2025-10-26 12:27:15 +00:00 
			
		
		
		
	Most of AIX support.
This commit is contained in:
		
							
								
								
									
										16
									
								
								GNUmakefile
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								GNUmakefile
									
									
									
									
									
								
							| @@ -1,4 +1,4 @@ | |||||||
| # $Id: GNUmakefile,v 1.75 2009-03-07 09:29:54 nicm Exp $ | # $Id: GNUmakefile,v 1.76 2009-03-31 21:22:10 nicm Exp $ | ||||||
|  |  | ||||||
| .PHONY: clean | .PHONY: clean | ||||||
|  |  | ||||||
| @@ -53,10 +53,12 @@ CFLAGS+= -g -ggdb -DDEBUG | |||||||
| LDFLAGS+= -rdynamic | LDFLAGS+= -rdynamic | ||||||
| LIBS+= -ldl | LIBS+= -ldl | ||||||
| endif | endif | ||||||
|  | ifeq (${CC},gcc) | ||||||
| CFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2 | CFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2 | ||||||
| CFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations | CFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations | ||||||
| CFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare | CFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare | ||||||
| CFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align | CFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align | ||||||
|  | endif | ||||||
|  |  | ||||||
| LDFLAGS+= | LDFLAGS+= | ||||||
| LIBS+= -lncurses | LIBS+= -lncurses | ||||||
| @@ -66,6 +68,18 @@ INSTALLDIR= install -d | |||||||
| INSTALLBIN= install -g bin -o root -m 555 | INSTALLBIN= install -g bin -o root -m 555 | ||||||
| INSTALLMAN= install -g bin -o root -m 444 | INSTALLMAN= install -g bin -o root -m 444 | ||||||
|  |  | ||||||
|  | ifeq ($(shell uname),AIX) | ||||||
|  | INCDIRS+= -I/usr/local/include/ncurses -Icompat | ||||||
|  | SRCS+= compat/vis.c compat/strlcpy.c compat/strlcat.c compat/strtonum.c \ | ||||||
|  |        compat/fgetln.c compat/asprintf.c compat/daemon.c compat/forkpty-aix.c \ | ||||||
|  |        compat/getopt_long.c compat/bsd-poll.c | ||||||
|  | CFLAGS+= -DNO_TREE_H -DNO_ASPRINTF -DNO_QUEUE_H -DNO_VSYSLOG | ||||||
|  |          -DNO_PROGNAME -DNO_STRLCPY -DNO_STRLCAT -DNO_STRTONUM \ | ||||||
|  | 	 -DNO_SETPROCTITLE -DNO_QUEUE_H -DNO_TREE_H -DNO_FORKPTY -DNO_FGETLN \ | ||||||
|  | 	 -DBROKEN_GETOPT -DBROKEN_POLL | ||||||
|  | LDFLAGS+= -L/usr/local/lib | ||||||
|  | endif | ||||||
|  |  | ||||||
| ifeq ($(shell uname),IRIX64) | ifeq ($(shell uname),IRIX64) | ||||||
| INCDIRS+= -Icompat -I/usr/local/include/ncurses | INCDIRS+= -Icompat -I/usr/local/include/ncurses | ||||||
| SRCS+= compat/strlcpy.c compat/strtonum.c compat/daemon.c \ | SRCS+= compat/strlcpy.c compat/strtonum.c compat/daemon.c \ | ||||||
|   | |||||||
| @@ -56,7 +56,6 @@ struct option { | |||||||
| 	int val; | 	int val; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| __BEGIN_DECLS |  | ||||||
| int	 getopt_long(int, char * const *, const char *, | int	 getopt_long(int, char * const *, const char *, | ||||||
| 	    const struct option *, int *); | 	    const struct option *, int *); | ||||||
| int	 getopt_long_only(int, char * const *, const char *, | int	 getopt_long_only(int, char * const *, const char *, | ||||||
| @@ -73,6 +72,5 @@ extern   int optopt; | |||||||
| extern   int optreset; | extern   int optreset; | ||||||
| extern   char *suboptarg;               /* getsubopt(3) external variable */ | extern   char *suboptarg;               /* getsubopt(3) external variable */ | ||||||
| #endif | #endif | ||||||
| __END_DECLS |  | ||||||
|  |  | ||||||
| #endif /* !_GETOPT_H_ */ | #endif /* !_GETOPT_H_ */ | ||||||
|   | |||||||
| @@ -49,13 +49,14 @@ | |||||||
|  * POSSIBILITY OF SUCH DAMAGE. |  * POSSIBILITY OF SUCH DAMAGE. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #include <err.h> | /* #include <err.h> */ | ||||||
| #include <errno.h> | #include <errno.h> | ||||||
| /* #include <getopt.h> */ | /* #include <getopt.h> */ | ||||||
| #include <stdlib.h> | #include <stdlib.h> | ||||||
| #include <string.h> | #include <string.h> | ||||||
|  |  | ||||||
| #include "tmux.h" | #include "tmux.h" | ||||||
|  | #define warnx(a, b) /* XXX */ | ||||||
|  |  | ||||||
| #define	REPLACE_GETOPT		/* use this getopt as the system getopt(3) */ | #define	REPLACE_GETOPT		/* use this getopt as the system getopt(3) */ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -73,7 +73,6 @@ | |||||||
|  |  | ||||||
| #include <sys/cdefs.h> | #include <sys/cdefs.h> | ||||||
|  |  | ||||||
| __BEGIN_DECLS |  | ||||||
| char	*vis(char *, int, int, int); | char	*vis(char *, int, int, int); | ||||||
| int	strvis(char *, const char *, int); | int	strvis(char *, const char *, int); | ||||||
| int	strnvis(char *, const char *, size_t, int); | int	strnvis(char *, const char *, size_t, int); | ||||||
| @@ -82,6 +81,4 @@ int	strunvis(char *, const char *); | |||||||
| int	unvis(char *, char, int *, int); | int	unvis(char *, char, int *, int); | ||||||
| ssize_t strnunvis(char *, const char *, size_t); | ssize_t strnunvis(char *, const char *, size_t); | ||||||
|  |  | ||||||
| __END_DECLS |  | ||||||
|  |  | ||||||
| #endif /* !_VIS_H_ */ | #endif /* !_VIS_H_ */ | ||||||
|   | |||||||
							
								
								
									
										6
									
								
								log.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								log.c
									
									
									
									
									
								
							| @@ -1,4 +1,4 @@ | |||||||
| /* $Id: log.c,v 1.10 2008-12-08 16:19:51 nicm Exp $ */ | /* $Id: log.c,v 1.11 2009-03-31 21:22:10 nicm Exp $ */ | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> |  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> | ||||||
| @@ -111,7 +111,11 @@ log_vwrite(int pri, const char *msg, va_list ap) | |||||||
|  |  | ||||||
| 	switch (log_type) { | 	switch (log_type) { | ||||||
| 	case LOG_TYPE_SYSLOG: | 	case LOG_TYPE_SYSLOG: | ||||||
|  | #ifdef NO_VSYSLOG | ||||||
|  | 		/* XXX */ | ||||||
|  | #else | ||||||
| 		vsyslog(pri, msg, ap); | 		vsyslog(pri, msg, ap); | ||||||
|  | #endif | ||||||
| 		break; | 		break; | ||||||
| 	case LOG_TYPE_TTY: | 	case LOG_TYPE_TTY: | ||||||
| 		if (pri == LOG_INFO) | 		if (pri == LOG_INFO) | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| /* $Id: osdep-unknown.c,v 1.3 2009-02-18 08:41:46 nicm Exp $ */ | /* $Id: osdep-unknown.c,v 1.4 2009-03-31 21:22:10 nicm Exp $ */ | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> |  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> | ||||||
| @@ -24,7 +24,7 @@ | |||||||
| #include "tmux.h" | #include "tmux.h" | ||||||
|  |  | ||||||
| char * | char * | ||||||
| get_argv0(unused pid_t pgrp) | osdep_get_name(unused int fd, unused char *tty) | ||||||
| { | { | ||||||
| 	return (NULL); | 	return (NULL); | ||||||
| } | } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Nicholas Marriott
					Nicholas Marriott