Use C++11 <cstdint> on Windows.

2016-01-14 23:25:52 +00:00 · 2016-01-14 23:25:52 +00:00 · 636dd5a112
parent 88af4e606e
commit 636dd5a112
3 changed files with 1 additions and 13 deletions
--- a/HomebrewDMRIPSC.h
+++ b/HomebrewDMRIPSC.h
@ -25,14 +25,7 @@
 #include "DMRData.h"

 #include <string>
-
-#if defined(_WIN32) || defined(_WIN64)
-typedef unsigned int   uint32_t;
-typedef unsigned short uint16_t;
-typedef unsigned char  uint8_t;
-#else
 #include <cstdint>
-#endif

 class CHomebrewDMRIPSC
 {
--- a/Modem.cpp
+++ b/Modem.cpp
@ -26,12 +26,11 @@

 #include <cmath>
 #include <cassert>
+#include <cstdint>

 #if defined(_WIN32) || defined(_WIN64)
 #include <Windows.h>
-typedef unsigned int uint32_t;
 #else
-#include <cstdint>
 #include <unistd.h>
 #endif

--- a/SHA256.h
+++ b/SHA256.h
@ -20,11 +20,7 @@
 #ifndef SHA256_H
 #define SHA256_H

-#if defined(_WIN32) || defined(_WIN64)
-typedef unsigned int uint32_t;
-#else
 #include <cstdint>
-#endif

 enum {
 	SHA256_DIGEST_SIZE = 256 / 8