From 0b29fd3d4584bdaee16b1289fc19b43fac5eb285 Mon Sep 17 00:00:00 2001
Message-Id: <0b29fd3d4584bdaee16b1289fc19b43fac5eb285.1714831562.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 17 Nov 2013 11:32:44 +0000
Subject: [PATCH] Add uint16_t if missing.
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 configure.ac | 2 +-
 lib/common.h | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index c17ad1c..dd46045 100644
--- a/configure.ac
+++ b/configure.ac
@@ -575,7 +575,7 @@ fi
 
 old_CFLAGS="${CFLAGS}"
 CFLAGS="${CFLAGS} $gcc_werror"
-AC_CHECK_TYPES([long long,uint32_t,uint8_t,intmax_t,uintmax_t])
+AC_CHECK_TYPES([long long,uint32_t,uint16_t,uint8_t,intmax_t,uintmax_t])
 
 # Some GCC invocations warn for converting function pointers to void *.
 # This is fair enough, as it's technically forbidden, but we use dlsym()
diff --git a/lib/common.h b/lib/common.h
index 9cf3892..99f8671 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -117,6 +117,14 @@ typedef unsigned char uint32_t;
 # endif
 #endif
 
+#if ! HAVE_UINT16_T
+# if USHRT_MAX == 65535
+typedef unsigned short uint16_t;
+# else
+#  error cannot determine uint16_t
+# endif
+#endif
+
 #if !HAVE_CLOSESOCKET
 # define closesocket close
 #endif
-- 
[mdw]