@@@ timeout wip

[mLib] / utils / bits.h

diff --git a/utils/bits.h b/utils/bits.h
index 4d1d61a..28c7dd4 100644 (file)
--- a/utils/bits.h
+++ b/utils/bits.h
@@ -36,7 +36,7 @@
 
 #include <limits.h>
 #include <stddef.h>
-#if __STDC_VERSION__ >= 199900l
+#if __STDC_VERSION__ >= 199901
 #  include <stdint.h>
 #endif
 
@@ -184,21 +184,21 @@ typedef unsigned char octet, uint8;
 /* --- List macros --- */
 
 #ifdef HAVE_UINT64
-#  define  DOUINTCONV(_)                                               \
-     _(8, 8, 8)                                                                \
-     _(16, 16, 16) _(16, 16_L, 16l) _(16, 16_B, 16b)                   \
-     _(24, 24, 24) _(24, 24_L, 24l) _(24, 24_B, 24b)                   \
-     _(32, 32, 32) _(32, 32_L, 32l) _(32, 32_B, 32b)                   \
+#  define  DOUINTCONV_64(_)                                            \
      _(64, 64, 64) _(64, 64_L, 64l) _(64, 64_B, 64b)
-#  define DOUINTSZ(_) _(8) _(16) _(24) _(32) _(64)
+#  define  DOUINTSZ_64(_) _(64)
 #else
-#  define  DOUINTCONV(_)                                               \
+#  define DOUINTCONV_64(_)
+#  define DOUINTSZ_64(_)
+#endif
+
+#define  DOUINTCONV(_)                                                 \
      _(8, 8, 8)                                                                \
      _(16, 16, 16) _(16, 16_L, 16l) _(16, 16_B, 16b)                   \
      _(24, 24, 24) _(24, 24_L, 24l) _(24, 24_B, 24b)                   \
-     _(32, 32, 32) _(32, 32_L, 32l) _(32, 32_B, 32b)
-#  define DOUINTSZ(_) _(8) _(16) _(24) _(32)
-#endif
+     _(32, 32, 32) _(32, 32_L, 32l) _(32, 32_B, 32b)                   \
+     DOUINTCONV_64(_)
+#define DOUINTSZ(_) _(8) _(16) _(24) _(32) _DOUINTSZ_64(_)
 
 /* --- Type coercions --- */