summaryrefslogtreecommitdiffstats
path: root/compat
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2009-03-31 21:22:10 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2009-03-31 21:22:10 +0000
commit792b28ec3eb755fda79f986da27e19bec7c552ac (patch)
tree55069db41d90149b6c89d6681431a5289c8faf74 /compat
parent6c27f1c33533bbc3223661d21cf43d97dee55c80 (diff)
Most of AIX support.
Diffstat (limited to 'compat')
-rw-r--r--compat/getopt.h2
-rw-r--r--compat/getopt_long.c3
-rw-r--r--compat/vis.h3
3 files changed, 2 insertions, 6 deletions
diff --git a/compat/getopt.h b/compat/getopt.h
index 4e6689c3..aab7fe2e 100644
--- a/compat/getopt.h
+++ b/compat/getopt.h
@@ -56,7 +56,6 @@ struct option {
int val;
};
-__BEGIN_DECLS
int getopt_long(int, char * const *, const char *,
const struct option *, int *);
int getopt_long_only(int, char * const *, const char *,
@@ -73,6 +72,5 @@ extern int optopt;
extern int optreset;
extern char *suboptarg; /* getsubopt(3) external variable */
#endif
-__END_DECLS
#endif /* !_GETOPT_H_ */
diff --git a/compat/getopt_long.c b/compat/getopt_long.c
index 20555612..9bd4fe14 100644
--- a/compat/getopt_long.c
+++ b/compat/getopt_long.c
@@ -49,13 +49,14 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <err.h>
+/* #include <err.h> */
#include <errno.h>
/* #include <getopt.h> */
#include <stdlib.h>
#include <string.h>
#include "tmux.h"
+#define warnx(a, b) /* XXX */
#define REPLACE_GETOPT /* use this getopt as the system getopt(3) */
diff --git a/compat/vis.h b/compat/vis.h
index 23ae0469..d4a43af5 100644
--- a/compat/vis.h
+++ b/compat/vis.h
@@ -73,7 +73,6 @@
#include <sys/cdefs.h>
-__BEGIN_DECLS
char *vis(char *, int, int, int);
int strvis(char *, const char *, int);
int strnvis(char *, const char *, size_t, int);
@@ -82,6 +81,4 @@ int strunvis(char *, const char *);
int unvis(char *, char, int *, int);
ssize_t strnunvis(char *, const char *, size_t);
-__END_DECLS
-
#endif /* !_VIS_H_ */