ADD WORD SIZE DETECTION FOR MSVC

aklomp · Jul 5, 2016 · fcab175 · fcab175
1 parent 3d16dd3
commit fcab175
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/lib/codec_plain.c b/lib/codec_plain.c
@@ -8,9 +8,9 @@
 BASE64_ENC_FUNCTION(plain)
 {
 	#include "enc/head.c"
-#if __WORDSIZE == 32
+#if BASE64_WORDSIZE == 32
 	#include "enc/uint32.c"
-#elif __WORDSIZE == 64
+#elif BASE64_WORDSIZE == 64
 	#include "enc/uint64.c"
 #endif
 	#include "enc/tail.c"
@@ -19,9 +19,9 @@ BASE64_ENC_FUNCTION(plain)
 BASE64_DEC_FUNCTION(plain)
 {
 	#include "dec/head.c"
-#if __WORDSIZE == 32
+#if BASE64_WORDSIZE == 32
 	#include "dec/uint32.c"
-#elif __WORDSIZE == 64
+#elif BASE64_WORDSIZE == 64
 	#include "dec/uint64.c"
 #endif
 	#include "dec/tail.c"

diff --git a/lib/codecs.h b/lib/codecs.h
@@ -93,6 +93,13 @@ struct codec
 	#define cpu_to_be64(x)	(x)
 	#define be32_to_cpu(x)	(x)
 	#define be64_to_cpu(x)	(x)
+#endif 
+
+// detect word size
+#ifdef _INTEGRAL_MAX_BITS
+#define BASE64_WORDSIZE _INTEGRAL_MAX_BITS
+#else
+#define BASE64_WORDSIZE __WORDSIZE
 #endif
 
 void codec_choose (struct codec *, int flags);