diff options
author | Fedja Beader <fedja@protonmail.ch> | 2024-05-30 01:42:41 +0200 |
---|---|---|
committer | Fedja Beader <fedja@protonmail.ch> | 2025-04-16 17:19:52 +0200 |
commit | 952944973145699ccae0516645118635bab03eb2 (patch) | |
tree | a09c92ed1bcf215821c460daf122b5db3d3b04cf | |
parent | ebb8e8dfc6c0b902227c78b82819db060268eb63 (diff) | |
download | manaplus-stdint.h.tar.gz manaplus-stdint.h.tar.bz2 manaplus-stdint.h.tar.xz manaplus-stdint.h.zip |
Use stdint.h instead of ifdefing tr1/cstdint, cstdint and stdint.hstdint.h
Rationale: By the standard, cstdint guarantees these basic types
in std::, but *may* put them into the global namespace.
By including stdint.h directly, we guarantee that these types are
in the global namespace. stdint.h is
also a C++ standard header guaranteed as part of the C compatibility
support, thus toolchains should support this.
The proper(tm) way of going about this would mean either prefixing
[u]int[0-9]*_t with std:: everywhere where they are used (a chore)
or having a proxy header that includes cstdint and around 50
using statements. The latter sounds to me like a good approach for
toolchains that do not provide stdint.h and do not pollute global
namespace. If such a toolchain exists in the wild.
See discussion at
https://stackoverflow.com/questions/13642827/cstdint-vs-stdint-h
In practice, my toolchain's (gcc 14 on GNU) cstdint includes stdint.h
then drags those types into std:: as well.
-rw-r--r-- | src/const/net/maxpacketversion.h | 10 | ||||
-rw-r--r-- | src/const/net/net.h | 12 | ||||
-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 | ||||
-rw-r--r-- | src/options.h | 11 | ||||
-rw-r--r-- | src/render/opengl/mgltypes.h | 10 |
9 files changed, 11 insertions, 86 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 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" diff --git a/src/options.h b/src/options.h index e739e28b1..e2bdea503 100644 --- a/src/options.h +++ b/src/options.h @@ -24,18 +24,9 @@ #ifndef OPTIONS_H #define OPTIONS_H +#include <stdint.h> // see commit's discussion #include <string> -#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 "localconsts.h" /** diff --git a/src/render/opengl/mgltypes.h b/src/render/opengl/mgltypes.h index 3ea8cff45..b9ecef739 100644 --- a/src/render/opengl/mgltypes.h +++ b/src/render/opengl/mgltypes.h @@ -72,15 +72,7 @@ PRAGMA45(GCC diagnostic pop) RENDER_OPENGL_MGLDEFINES_H #ifndef USE_SDL2 -#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 #endif // USE_SDL2 typedef void (APIENTRY *glGenRenderbuffers_t)(GLsizei, GLuint *); |