aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2010-11-11 20:45:49 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2010-11-11 20:45:49 +0000
commita6fc49ae082c6972a126cf255eb66343b0fc0243 (patch)
treeb2923f53c8158febffacaacec6507fbb1296fc67
parent94c2adf49958c568b940bb1394fa5f62c492cb2d (diff)
downloadrtmux-a6fc49ae082c6972a126cf255eb66343b0fc0243.tar.gz
rtmux-a6fc49ae082c6972a126cf255eb66343b0fc0243.tar.bz2
rtmux-a6fc49ae082c6972a126cf255eb66343b0fc0243.zip
Fix AIX warnings.
-rw-r--r--compat.h4
-rwxr-xr-xconfigure3
2 files changed, 4 insertions, 3 deletions
diff --git a/compat.h b/compat.h
index eba32caa..1c279fb2 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 <nicm@users.sourceforge.net>
@@ -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 cc520ec8..3f9500fc 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 <nicm@users.sourceforge.net>
#
@@ -131,7 +131,6 @@ EOF
# ------------------------------------------------------------------------------
AIX)
cat <<EOF >>$CONFIG_H
-#define HAVE_BZERO
#define HAVE_SETENV
#define HAVE_STDINT_H
EOF