# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1420643071 -7200
# Node ID 6a0e9980b76b0f06e85d869ff86d383b7cc4407e
# Parent  bca55caf5c37203592a9224538d4a91a5b14d291
Mostly cosmetic changes.

diff -r bca55caf5c37 -r 6a0e9980b76b th_types.h
--- a/th_types.h	Wed Jan 07 16:56:29 2015 +0200
+++ b/th_types.h	Wed Jan 07 17:04:31 2015 +0200
@@ -28,7 +28,7 @@
 // Shorthand types
 typedef unsigned long int ulint_t;
 typedef signed long int lint_t;
-#ifndef HAVE_UINT_T
+#ifndef HAVE_UINT_T // BOOST defines uint_t at least
 typedef unsigned int uint_t;
 #endif
 
@@ -38,43 +38,35 @@
 #ifdef TH_TYPE_I8
 typedef unsigned TH_TYPE_I8 uint8_t;    // 8 bits, unsigned
 typedef signed TH_TYPE_I8 int8_t;    // 8 bits, signed
-#else
-#ifndef HAVE_INT_TYPES
+#elif !defined(HAVE_INT_TYPES)
 typedef unsigned char uint8_t;
 typedef signed char int8_t;
 #endif
-#endif
 
 
 #ifdef TH_TYPE_I16
 typedef unsigned TH_TYPE_I16 uint16_t;    // 16 bits, unsigned == 2 BYTEs
 typedef signed TH_TYPE_I16 int16_t;    // 16 bits, signed
-#else
-#ifndef HAVE_INT_TYPES
+#elif !defined(HAVE_INT_TYPES)
 typedef unsigned short int uint16_t;
 typedef signed short int int16_t;
 #endif
-#endif
 
 #ifdef TH_TYPE_I32
 typedef unsigned TH_TYPE_I32 uint32_t;    // 32 bits, unsigned == 4 BYTES == 2 WORDs
 typedef signed TH_TYPE_I32 int32_t;    // 32 bits, signed
-#else
-#ifndef HAVE_INT_TYPES
+#elif !defined(HAVE_INT_TYPES)
 typedef unsigned int uint32_t;
 typedef signed int int32_t;
 #endif
-#endif
 
 #ifdef TH_TYPE_I64
 typedef unsigned TH_TYPE_I64 uint64_t;    // 64 bits, unsigned == 8 BYTES == 2 DWORDs
 typedef signed TH_TYPE_I64 int64_t;    // 64 bits, signed
-#else
-#ifndef HAVE_INT_TYPES
+#elif !defined(HAVE_INT_TYPES)
 typedef unsigned long long uint64_t;
 typedef signed long long int64_t;
 #endif
-#endif
 
 
 /* This is the character type used in all string-related routines of