diff options
Diffstat (limited to 'tmux.h')
| -rw-r--r-- | tmux.h | 128 |
1 files changed, 2 insertions, 126 deletions
@@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.342 2009-06-25 16:34:50 nicm Exp $ */ +/* $Id: tmux.h,v 1.343 2009-06-25 16:47:00 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -20,34 +20,13 @@ #define TMUX_H #include "config.h" +#include "compat.h" #define PROTOCOL_VERSION -13 #include <sys/param.h> #include <sys/time.h> -#ifdef HAVE_QUEUE_H -#include <sys/queue.h> -#else -#include "compat/queue.h" -#endif - -#ifdef HAVE_TREE_H -#include <sys/tree.h> -#else -#include "compat/tree.h" -#endif - -#ifdef HAVE_POLL -#include <poll.h> -#else -#include "compat/bsd-poll.h" -#endif - -#ifdef HAVE_GETOPT -#include <getopt.h> -#endif - #include <bitstring.h> #include <limits.h> #include <signal.h> @@ -60,55 +39,6 @@ extern const char *__progname; -#ifndef INFTIM -#define INFTIM -1 -#endif - -#ifndef WAIT_ANY -#define WAIT_ANY -1 -#endif - -#ifndef SUN_LEN -#define SUN_LEN(sun) (sizeof (sun)->sun_path) -#endif - -#ifndef __dead -#define __dead __attribute__ ((__noreturn__)) -#endif -#ifndef __packed -#define __packed __attribute__ ((__packed__)) -#endif - -#ifndef timercmp -#define timercmp(tvp, uvp, cmp) \ - (((tvp)->tv_sec == (uvp)->tv_sec) ? \ - ((tvp)->tv_usec cmp (uvp)->tv_usec) : \ - ((tvp)->tv_sec cmp (uvp)->tv_sec)) -#endif - -#ifndef timeradd -#define timeradd(tvp, uvp, vvp) \ - do { \ - (vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \ - (vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \ - if ((vvp)->tv_usec >= 1000000) { \ - (vvp)->tv_sec++; \ - (vvp)->tv_usec -= 1000000; \ - } \ - } while (0) -#endif - -#ifndef TTY_NAME_MAX -#define TTY_NAME_MAX 32 -#endif - -#ifndef HAVE_PATHS_H -#define _PATH_BSHELL "/bin/sh" -#define _PATH_TMP "/tmp/" -#define _PATH_DEVNULL "/dev/null" -#define _PATH_TTY "/dev/tty" -#endif - /* Default configuration file. */ #define DEFAULT_CFG ".tmux.conf" @@ -1005,58 +935,6 @@ extern const struct set_option_entry set_window_option_table[]; #define NSETOPTION 25 #define NSETWINDOWOPTION 19 -#ifndef HAVE_STRTONUM -/* strtonum.c */ -long long strtonum(const char *, long long, long long, const char **); -#endif - -#ifndef HAVE_STRLCPY -/* strlcpy.c */ -size_t strlcpy(char *, const char *, size_t); -#endif - -#ifndef HAVE_STRLCAT -/* strlcat.c */ -size_t strlcat(char *, const char *, size_t); -#endif - -#ifndef HAVE_DAEMON -/* daemon.c */ -int daemon(int, int); -#endif - -#ifndef HAVE_FORKPTY -/* forkpty.c */ -pid_t forkpty(int *, char *, struct termios *, struct winsize *); -#endif - -#ifndef HAVE_ASPRINTF -/* asprintf.c */ -int asprintf(char **, const char *, ...); -int vasprintf(char **, const char *, va_list); -#endif - -#ifndef HAVE_FGETLN -/* fgetln.c */ -char *fgetln(FILE *, size_t *); -#endif - -#ifndef HAVE_GETOPT -/* getopt.c */ -extern int BSDopterr; -extern int BSDoptind; -extern int BSDoptopt; -extern int BSDoptreset; -extern char *BSDoptarg; -int BSDgetopt(int, char *const *, const char *); -#define getopt(ac, av, o) BSDgetopt(ac, av, o) -#define opterr BSDopterr -#define optind BSDoptind -#define optopt BSDoptopt -#define optreset BSDoptreset -#define optarg BSDoptarg -#endif - /* tmux.c */ extern volatile sig_atomic_t sigwinch; extern volatile sig_atomic_t sigterm; @@ -1681,7 +1559,5 @@ int xvasprintf(char **, const char *, va_list); int printflike3 xsnprintf(char *, size_t, const char *, ...); int xvsnprintf(char *, size_t, const char *, va_list); int printflike3 printpath(char *, size_t, const char *, ...); -char *xdirname(const char *); -char *xbasename(const char *); #endif /* TMUX_H */ |