From fd6ac1697108e74650d8e4ef5c05713a8485c5f0 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 9 Apr 2010 14:53:27 +1200
Subject: [PATCH] Revert type regression slipped in from autoconf-refactor

---
 include/config.h | 111 -----------------------------------------------
 1 file changed, 111 deletions(-)

diff --git a/include/config.h b/include/config.h
index 7bc6bc2a6e..5533a3a115 100644
--- a/include/config.h
+++ b/include/config.h
@@ -63,117 +63,6 @@
 #endif
 #endif
 
-/* Typedefs for missing entries on a system */
-
-/* int8_t */
-#if !HAVE_INT8_T
-#if HAVE_CHAR && SIZEOF_CHAR == 1
-typedef char int8_t;
-#else
-#error NO 8 bit signed type available
-#endif
-#endif
-
-/* u_int8_t */
-#if !HAVE_U_INT8_T
-#if HAVE_UINT8_T
-typedef uint8_t u_int8_t;
-#else
-typedef unsigned char u_int8_t;
-#endif
-#endif
-
-/* int16_t */
-#if !HAVE_INT16_T
-#if HAVE_SHORT && SIZEOF_SHORT == 2
-typedef short int16_t;
-#elif HAVE_INT && SIZEOF_INT == 2
-typedef int int16_t;
-#else
-#error NO 16 bit signed type available
-#endif
-#endif
-
-/* u_int16_t */
-#if !HAVE_U_INT16_T
-#if HAVE_UINT16_T
-typedef uint16_t u_int16_t;
-#else
-typedef unsigned int16_t u_int16_t;
-#endif
-#endif
-
-/* int32_t */
-#if !HAVE_INT32_T
-#if HAVE_INT && SIZEOF_INT == 4
-typedef int int32_t;
-#elif HAVE_LONG && SIZEOF_LONG == 4
-typedef long int32_t;
-#else
-#error NO 32 bit signed type available
-#endif
-#endif
-
-/* u_int32_t */
-#if !HAVE_U_INT32_T
-#if HAVE_UINT32_T
-typedef uint32_t u_int32_t;
-#else
-typedef unsigned int32_t u_int32_t;
-#endif
-#endif
-
-/* int64_t */
-#if !HAVE_INT64_T
-#if HAVE___INT64
-typedef __int64 int64_t;
-#elif HAVE_LONG && SIZEOF_LONG == 8
-typedef long int64_t;
-#elif HAVE_LONG_LONG && SIZEOF_LONG_LONG == 8
-typedef long long int64_t;
-#else
-#error NO 64 bit signed type available
-#endif
-#endif
-
-/* u_int64_t */
-#if !HAVE_U_INT64_T
-#if HAVE_UINT64_T
-typedef uint64_t u_int64_t;
-#else
-typedef unsigned int64_t u_int64_t;
-#endif
-#endif
-
-
-#if !HAVE_PID_T
-typedef int pid_t;
-#endif
-
-#if !HAVE_SIZE_T
-typedef unsigned int size_t;
-#endif
-
-#if !HAVE_SSIZE_T
-typedef int ssize_t;
-#endif
-
-#if !HAVE_OFF_T
-typedef int off_t;
-#endif
-
-#if !HAVE_MODE_T
-typedef unsigned short mode_t;
-#endif
-
-#if !HAVE_FD_MASK
-typedef unsigned long fd_mask;
-#endif
-
-#if !HAVE_SOCKLEN_T
-typedef int socklen_t;
-#endif
-
 #if !defined(CACHEMGR_HOSTNAME)
 #define CACHEMGR_HOSTNAME ""
 #else
-- 
2.47.2