Refactor type definitions: Pull out shared part

git-svn-id: svn://svn.code.sf.net/p/bs2b/code/trunk/libbs2b@59 bc0edfbe-c936-4687-b64d-f70bc3985e72

1 files changed, 7 insertions, 9 deletions

diff --git a/src/bs2b.h b/src/bs2b.h
index 0ce9860..528eb85 100644
--- a/src/bs2b.h
+++ b/src/bs2b.h
@@ -29,21 +29,19 @@
 #include "bs2bversion.h"
 
 #if HAVE_STDINT_H
-#include <stdint.h>
-#elif UINT_MAX == 0xffff /* 16 bit compiler */
+# include <stdint.h>
+#else
 typedef signed   char    int8_t;
-typedef signed   short   int16_t;
-typedef signed   long    int32_t;
 typedef unsigned char    uint8_t;
+typedef signed   short   int16_t;
 typedef unsigned short   uint16_t;
+# if UINT_MAX == 0xffff /* 16 bit compiler */
+typedef signed   long    int32_t;
 typedef unsigned long    uint32_t;
-#else /* UINT_MAX != 0xffff */ /* 32/64 bit compiler */
-typedef signed   char    int8_t;
-typedef signed   short   int16_t;
+# else /* UINT_MAX != 0xffff */ /* 32/64 bit compiler */
 typedef signed   int     int32_t;
-typedef unsigned char    uint8_t;
-typedef unsigned short   uint16_t;
 typedef unsigned int     uint32_t;
+# endif
 #endif /* HAVE_STDINT_H */
 
 typedef struct