stdint.h compatibility stuff

animetosho · Oct 25, 2015 · ca5b84e · ca5b84e
1 parent 7ab9179
commit ca5b84e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/gf-complete/gf_complete.h b/gf-complete/gf_complete.h
@@ -10,11 +10,7 @@
 
 #ifndef _GF_COMPLETE_H_
 #define _GF_COMPLETE_H_
-#if defined(_MSC_VER) && !defined(_STDINT) && _MSC_VER < 1900
-#include "msc_stdint.h"
-#else
-#include <stdint.h>
-#endif
+#include "../stdint.h"
 
 #include "platform.h"
 

diff --git a/gf-complete/gf_w16.h b/gf-complete/gf_w16.h
@@ -11,11 +11,7 @@
 #ifndef GF_COMPLETE_GF_W16_H
 #define GF_COMPLETE_GF_W16_H
 
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#include "msc_stdint.h"
-#else
-#include <stdint.h>
-#endif
+#include "../stdint.h"
 
 #define GF_FIELD_WIDTH (16)
 #define GF_FIELD_SIZE (1 << GF_FIELD_WIDTH)

diff --git a/md5/md5.h b/md5/md5.h
@@ -1,4 +1,4 @@
-#include <stdint.h>
+#include "../stdint.h"
 
 #define MD5_BLOCKSIZE 64
 

diff --git a/gf-complete/msc_stdint.h → stdint.h b/gf-complete/msc_stdint.h → stdint.h
@@ -29,9 +29,9 @@
 // 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
+#if !defined(_MSC_VER) || defined(_STDINT) || _MSC_VER >= 1900
+#include <stdint.h>
+#else
 
 #ifndef _MSC_STDINT_H_ // [
 #define _MSC_STDINT_H_
@@ -245,3 +245,5 @@ typedef uint64_t  uintmax_t;
 
 
 #endif // _MSC_STDINT_H_ ]
+
+#endif // MSVC stuff