diff options
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/chatrecv.h | 12 | ||||
| -rw-r--r-- | src/net/ea/traderecv.h | 11 | ||||
| -rw-r--r-- | src/net/eathena/beingrecv.h | 10 | ||||
| -rw-r--r-- | src/net/tmwa/beingrecv.h | 10 | ||||
| -rw-r--r-- | src/net/worldinfo.h | 11 |
5 files changed, 6 insertions, 48 deletions
diff --git a/src/net/ea/chatrecv.h b/src/net/ea/chatrecv.h index 00e149be8..805759005 100644 --- a/src/net/ea/chatrecv.h +++ b/src/net/ea/chatrecv.h @@ -24,18 +24,10 @@ #ifndef NET_EA_CHATRECV_H #define NET_EA_CHATRECV_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 #include <string> #include <queue> + #ifndef __time_t_defined #include <sys/time.h> #endif // __time_t_defined diff --git a/src/net/ea/traderecv.h b/src/net/ea/traderecv.h index d2d614ec1..105245b63 100644 --- a/src/net/ea/traderecv.h +++ b/src/net/ea/traderecv.h @@ -24,16 +24,7 @@ #ifndef NET_EA_TRADERECV_H #define NET_EA_TRADERECV_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 #include <string> namespace Net diff --git a/src/net/eathena/beingrecv.h b/src/net/eathena/beingrecv.h index 7e414c449..ca9fb88ad 100644 --- a/src/net/eathena/beingrecv.h +++ b/src/net/eathena/beingrecv.h @@ -30,15 +30,7 @@ #include "enums/simpletypes/beingid.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 #include "localconsts.h" diff --git a/src/net/tmwa/beingrecv.h b/src/net/tmwa/beingrecv.h index 55e5773c5..ecd45854e 100644 --- a/src/net/tmwa/beingrecv.h +++ b/src/net/tmwa/beingrecv.h @@ -24,15 +24,7 @@ #ifndef NET_TMWA_BEINGRECV_H #define NET_TMWA_BEINGRECV_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 #include "localconsts.h" diff --git a/src/net/worldinfo.h b/src/net/worldinfo.h index daeb97b21..a8bb57d12 100644 --- a/src/net/worldinfo.h +++ b/src/net/worldinfo.h @@ -26,16 +26,7 @@ #include "utils/vector.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 #include <string> #include "localconsts.h" |