diff options
Diffstat (limited to 'src/const')
| -rw-r--r-- | src/const/net/maxpacketversion.h | 10 | ||||
| -rw-r--r-- | src/const/net/net.h | 12 |
2 files changed, 3 insertions, 19 deletions
diff --git a/src/const/net/maxpacketversion.h b/src/const/net/maxpacketversion.h index e44b005f7..2dcb3b96c 100644 --- a/src/const/net/maxpacketversion.h +++ b/src/const/net/maxpacketversion.h @@ -22,15 +22,7 @@ #ifndef CONST_NET_MAXPACKETVERSION_H #define CONST_NET_MAXPACKETVERSION_H -#if defined(__GXX_EXPERIMENTAL_CXX0X__) -#if defined(__APPLE__) -#include <tr1/cstdint> -#else // defined(__APPLE__) -#include <cstdint> -#endif // defined(__APPLE__) -#else // defined(__GXX_EXPERIMENTAL_CXX0X__) -#include <stdint.h> -#endif // defined(__GXX_EXPERIMENTAL_CXX0X__) +#include <stdint.h> // see commit's discussion static const uint32_t maxPacketVersion = 20171101; diff --git a/src/const/net/net.h b/src/const/net/net.h index 3790f2bf0..161e9825f 100644 --- a/src/const/net/net.h +++ b/src/const/net/net.h @@ -22,20 +22,12 @@ #ifndef CONST_NET_NET_H #define CONST_NET_NET_H -#if defined(__GXX_EXPERIMENTAL_CXX0X__) -#if defined(__APPLE__) -#include <tr1/cstdint> -#else // defined(__APPLE__) -#include <cstdint> -#endif // defined(__APPLE__) -#else // defined(__GXX_EXPERIMENTAL_CXX0X__) -#include <stdint.h> -#endif // defined(__GXX_EXPERIMENTAL_CXX0X__) +#include <stdint.h> // see commit's discussion #ifdef TMWA_SUPPORT static const uint16_t DEFAULT_PORT = 6901; #else // TMWA_SUPPORT - static const uint16_t DEFAULT_PORT = 6900; #endif // TMWA_SUPPORT + #endif // CONST_NET_NET_H |