]>
Commit | Line | Data |
---|---|---|
9970153a JP |
1 | From 5b5553fb90f17ad67fcdebfa05aa4b042834449d Mon Sep 17 00:00:00 2001 |
2 | From: Heiko Becker <heirecka@exherbo.org> | |
3 | Date: Wed, 25 Jan 2023 23:42:42 +0100 | |
4 | Subject: [PATCH] Fix build with gcc 13 by including <cstdint> | |
5 | ||
6 | Like other versions before, gcc 13 moved some includes around and as a | |
7 | result <cstdint> is no longer transitively included. Explicitly include | |
8 | it for uint*_t. | |
9 | --- | |
10 | src/base/md5.h | 1 + | |
11 | src/base/random.h | 1 + | |
12 | src/base/time_string.h | 1 + | |
13 | src/build_info.h | 1 + | |
14 | src/graphic/align.h | 1 + | |
15 | src/graphic/text/textstream.h | 1 + | |
16 | src/logic/generic_save_handler.h | 1 + | |
17 | src/logic/map_revision.h | 1 + | |
18 | src/logic/save_handler.h | 1 + | |
19 | src/map_io/map_elemental_packet.h | 1 + | |
20 | src/scripting/persistence.h | 2 ++ | |
21 | 11 files changed, 12 insertions(+) | |
22 | ||
23 | diff --git a/src/base/md5.h b/src/base/md5.h | |
24 | index a11966ab81c..29a60b4bf87 100644 | |
25 | --- a/src/base/md5.h | |
26 | +++ b/src/base/md5.h | |
27 | @@ -21,6 +21,7 @@ | |
28 | #define WL_BASE_MD5_H | |
29 | ||
30 | #include <cassert> | |
31 | +#include <cstdint> | |
32 | #include <cstring> | |
33 | #include <string> | |
34 | ||
35 | diff --git a/src/base/random.h b/src/base/random.h | |
36 | index 5030805244a..76774bc3665 100644 | |
37 | --- a/src/base/random.h | |
38 | +++ b/src/base/random.h | |
39 | @@ -20,6 +20,7 @@ | |
40 | #define WL_BASE_RANDOM_H | |
41 | ||
42 | #include <cassert> | |
43 | +#include <cstdint> | |
44 | #include <string> | |
45 | ||
46 | extern const uint32_t rng_sbox[256]; | |
47 | diff --git a/src/base/time_string.h b/src/base/time_string.h | |
48 | index 0246b190958..47767732e76 100644 | |
49 | --- a/src/base/time_string.h | |
50 | +++ b/src/base/time_string.h | |
51 | @@ -19,6 +19,7 @@ | |
52 | #ifndef WL_BASE_TIME_STRING_H | |
53 | #define WL_BASE_TIME_STRING_H | |
54 | ||
55 | +#include <cstdint> | |
56 | #include <string> | |
57 | ||
58 | /// Get a string representation conforming to ISO 8601 of the current time (in | |
59 | diff --git a/src/build_info.h b/src/build_info.h | |
60 | index 5afecc13e82..88a382c19ce 100644 | |
61 | --- a/src/build_info.h | |
62 | +++ b/src/build_info.h | |
63 | @@ -19,6 +19,7 @@ | |
64 | #ifndef WL_BUILD_INFO_H | |
65 | #define WL_BUILD_INFO_H | |
66 | ||
67 | +#include <cstdint> | |
68 | #include <string> | |
69 | ||
70 | constexpr uint16_t kWidelandsCopyrightStart = 2002; | |
71 | diff --git a/src/graphic/align.h b/src/graphic/align.h | |
72 | index 205a0bd0d25..f76c5040e35 100644 | |
73 | --- a/src/graphic/align.h | |
74 | +++ b/src/graphic/align.h | |
75 | @@ -19,6 +19,7 @@ | |
76 | #ifndef WL_GRAPHIC_ALIGN_H | |
77 | #define WL_GRAPHIC_ALIGN_H | |
78 | ||
79 | +#include <cstdint> | |
80 | #include <string> | |
81 | ||
82 | #include "base/rect.h" | |
83 | diff --git a/src/graphic/text/textstream.h b/src/graphic/text/textstream.h | |
84 | index b2af46ee8e4..7fe027b8655 100644 | |
85 | --- a/src/graphic/text/textstream.h | |
86 | +++ b/src/graphic/text/textstream.h | |
87 | @@ -19,6 +19,7 @@ | |
88 | #ifndef WL_GRAPHIC_TEXT_TEXTSTREAM_H | |
89 | #define WL_GRAPHIC_TEXT_TEXTSTREAM_H | |
90 | ||
91 | +#include <cstdint> | |
92 | #include <string> | |
93 | ||
94 | namespace RT { | |
95 | diff --git a/src/logic/generic_save_handler.h b/src/logic/generic_save_handler.h | |
96 | index 15147293c4a..97bc7544ef0 100644 | |
97 | --- a/src/logic/generic_save_handler.h | |
98 | +++ b/src/logic/generic_save_handler.h | |
99 | @@ -19,6 +19,7 @@ | |
100 | #ifndef WL_LOGIC_GENERIC_SAVE_HANDLER_H | |
101 | #define WL_LOGIC_GENERIC_SAVE_HANDLER_H | |
102 | ||
103 | +#include <cstdint> | |
104 | #include <functional> | |
105 | ||
106 | #include "io/filesystem/filesystem.h" | |
107 | diff --git a/src/logic/map_revision.h b/src/logic/map_revision.h | |
108 | index b685a8a032e..27b0d5c40fe 100644 | |
109 | --- a/src/logic/map_revision.h | |
110 | +++ b/src/logic/map_revision.h | |
111 | @@ -19,6 +19,7 @@ | |
112 | #ifndef WL_LOGIC_MAP_REVISION_H | |
113 | #define WL_LOGIC_MAP_REVISION_H | |
114 | ||
115 | +#include <cstdint> | |
116 | #include <string> | |
117 | ||
118 | namespace Widelands { | |
119 | diff --git a/src/logic/save_handler.h b/src/logic/save_handler.h | |
120 | index 6e6956ae654..e01503b8cba 100644 | |
121 | --- a/src/logic/save_handler.h | |
122 | +++ b/src/logic/save_handler.h | |
123 | @@ -19,6 +19,7 @@ | |
124 | #ifndef WL_LOGIC_SAVE_HANDLER_H | |
125 | #define WL_LOGIC_SAVE_HANDLER_H | |
126 | ||
127 | +#include <cstdint> | |
128 | #include "io/filesystem/filesystem.h" | |
129 | ||
130 | namespace Widelands { | |
131 | diff --git a/src/map_io/map_elemental_packet.h b/src/map_io/map_elemental_packet.h | |
132 | index 4aa1e987e19..a20e649c01d 100644 | |
133 | --- a/src/map_io/map_elemental_packet.h | |
134 | +++ b/src/map_io/map_elemental_packet.h | |
135 | @@ -19,6 +19,7 @@ | |
136 | #ifndef WL_MAP_IO_MAP_ELEMENTAL_PACKET_H | |
137 | #define WL_MAP_IO_MAP_ELEMENTAL_PACKET_H | |
138 | ||
139 | +#include <cstdint> | |
140 | #include <string> | |
141 | #include <vector> | |
142 | ||
143 | diff --git a/src/scripting/persistence.h b/src/scripting/persistence.h | |
144 | index 3ab3f14ec18..dbcaec15c43 100644 | |
145 | --- a/src/scripting/persistence.h | |
146 | +++ b/src/scripting/persistence.h | |
147 | @@ -19,6 +19,8 @@ | |
148 | #ifndef WL_SCRIPTING_PERSISTENCE_H | |
149 | #define WL_SCRIPTING_PERSISTENCE_H | |
150 | ||
151 | +#include <cstdint> | |
152 | + | |
153 | #include "scripting/lua.h" | |
154 | ||
155 | class FileRead; |