From f54482a4612ef9f409e7ffe247b621ce90604d48 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Tue, 7 Sep 2010 19:32:58 +0000
Subject: [PATCH] Solaris 9 has no stdint.h, ugh. Reported by a couple of
 people most recently Timothy Larson.

---
 compat.h     | 8 +++++++-
 configure    | 9 ++++++++-
 input-keys.c | 3 +--
 tmux.h       | 3 +--
 window.c     | 3 +--
 xmalloc.c    | 3 +--
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/compat.h b/compat.h
index 3db11bc0..90758165 100644
--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,4 @@
-/* $Id: compat.h,v 1.25 2010-06-06 13:00:46 tcunha Exp $ */
+/* $Id: compat.h,v 1.26 2010-09-07 19:32:58 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -85,6 +85,12 @@ typedef uint64_t u_int64_t;
 #include <imsg.h>
 #endif
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
+
 #ifdef HAVE_BROKEN_CMSG_FIRSTHDR
 /* CMSG_FIRSTHDR broken on OS X. */
 #undef CMSG_FIRSTHDR
diff --git a/configure b/configure
index 3aed7c73..5462f64a 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: configure,v 1.53 2010-06-06 13:00:47 tcunha Exp $
+# $Id: configure,v 1.54 2010-09-07 19:32:58 nicm Exp $
 #
 # Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
 #
@@ -45,6 +45,7 @@ cat <<EOF >>$CONFIG_H
 #undef HAVE_PTY_H
 #undef HAVE_QUEUE_H
 #undef HAVE_SETPROCTITLE
+#undef HAVE_STDINT_H
 #undef HAVE_STRCASESTR
 #undef HAVE_STRLCAT
 #undef HAVE_STRLCPY
@@ -73,6 +74,7 @@ case $TMUX_PLATFORM in
 #define HAVE_QUEUE_H
 #define HAVE_SETENV
 #define HAVE_SETPROCTITLE
+#define HAVE_STDINT_H
 #define HAVE_STRCASESTR
 #define HAVE_STRLCAT
 #define HAVE_STRLCPY
@@ -99,6 +101,7 @@ EOF
 #define HAVE_PROGNAME
 #define HAVE_PTY_H
 #define HAVE_SETENV
+#define HAVE_STDINT_H
 #define HAVE_STRCASESTR
 #define HAVE_STRSEP
 #define HAVE_U_INT
@@ -124,6 +127,7 @@ EOF
 #define HAVE_BZERO
 #define HAVE_DAEMON
 #define HAVE_SETENV
+#define HAVE_STDINT_H
 EOF
 	cat <<EOF >>$CONFIG_MK
 LIBS+= -lcurses -levent
@@ -184,6 +188,7 @@ EOF
 #define HAVE_GETOPT
 #define HAVE_PATHS_H
 #define HAVE_PROGNAME
+#define HAVE_STDINT_H
 #define HAVE_SETENV
 #define HAVE_STRCASESTR
 #define HAVE_STRLCAT
@@ -219,6 +224,7 @@ EOF
 #define HAVE_PROGNAME
 #define HAVE_SETENV
 #define HAVE_SETPROCTITLE
+#define HAVE_STDINT_H
 #define HAVE_STRCASESTR
 #define HAVE_STRLCAT
 #define HAVE_STRLCPY
@@ -248,6 +254,7 @@ EOF
 #define HAVE_PROGNAME
 #define HAVE_SETPROCTITLE
 #define HAVE_SETENV
+#define HAVE_STDINT_H
 #define HAVE_STRCASESTR
 #define HAVE_STRLCAT
 #define HAVE_STRLCPY
diff --git a/input-keys.c b/input-keys.c
index 27bb3778..6207d936 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -1,4 +1,4 @@
-/* $Id: input-keys.c,v 1.44 2009-12-04 22:14:47 tcunha Exp $ */
+/* $Id: input-keys.c,v 1.45 2010-09-07 19:32:58 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/tmux.h b/tmux.h
index 32dc897e..696c0acd 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.574 2010-08-29 14:42:11 tcunha Exp $ */
+/* $Id: tmux.h,v 1.575 2010-09-07 19:32:58 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,6 @@
 #include <limits.h>
 #include <signal.h>
 #include <stdarg.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <termios.h>
 
diff --git a/window.c b/window.c
index a414b8c0..e23dda55 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.136 2010-08-29 14:46:13 tcunha Exp $ */
+/* $Id: window.c,v 1.137 2010-09-07 19:32:58 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -24,7 +24,6 @@
 #include <fnmatch.h>
 #include <pwd.h>
 #include <signal.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
diff --git a/xmalloc.c b/xmalloc.c
index 25643bfa..cda6e792 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,4 +1,4 @@
-/* $Id: xmalloc.c,v 1.12 2009-10-28 23:12:38 tcunha Exp $ */
+/* $Id: xmalloc.c,v 1.13 2010-09-07 19:32:58 nicm Exp $ */
 
 /*
  * Copyright (c) 2004 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -20,7 +20,6 @@
 
 #include <errno.h>
 #include <libgen.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>