summaryrefslogtreecommitdiffstats
authornicm <nicm>2010-11-11 20:45:49 (GMT)
committer Raghavendra D Prabhu <[email protected]>2011-01-02 18:59:31 (GMT)
commit5ce46c36b4041566972501495b7e29185a8e5124 (patch) (side-by-side diff)
tree6970867d5a6c441c9fbb93cced5e799be47d8101
parentc83ca39dfd8bf4b544be471e4e46136484296ebc (diff)
downloadtmux-old-5ce46c36b4041566972501495b7e29185a8e5124.zip
tmux-old-5ce46c36b4041566972501495b7e29185a8e5124.tar.gz
tmux-old-5ce46c36b4041566972501495b7e29185a8e5124.tar.bz2
Fix AIX warnings.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--compat.h4
-rwxr-xr-xconfigure3
2 files changed, 4 insertions, 3 deletions
diff --git a/compat.h b/compat.h
index f8e36e6..7e927f8 100644
--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,4 @@
-/* $Id: compat.h,v 1.30 2010/10/27 21:40:03 nicm Exp $ */
+/* $Id: compat.h,v 1.31 2010/11/11 20:45:49 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <[email protected]>
@@ -159,6 +159,7 @@ typedef uint64_t u_int64_t;
#endif
#ifndef HAVE_BZERO
+#undef bzero
#define bzero(buf, len) memset(buf, 0, len);
#endif
@@ -202,6 +203,7 @@ int daemon(int, int);
#ifndef HAVE_FORKPTY
/* forkpty.c */
+#include <sys/ioctl.h>
pid_t forkpty(int *, char *, struct termios *, struct winsize *);
#endif
diff --git a/configure b/configure
index abc84a4..9256b6f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: configure,v 1.57 2010/11/11 20:37:53 nicm Exp $
+# $Id: configure,v 1.58 2010/11/11 20:45:49 nicm Exp $
#
# Copyright (c) 2009 Nicholas Marriott <[email protected]>
#
@@ -131,7 +131,6 @@ EOF
# ------------------------------------------------------------------------------
AIX)
cat <<EOF >>$CONFIG_H
-#define HAVE_BZERO
#define HAVE_SETENV
#define HAVE_STDINT_H
EOF