1From 3acf784e988608cbce34cd0be0a8703ba53ea515 Mon Sep 17 00:00:00 2001
2From: Sam James <sam@gentoo.org>
3Date: Tue, 3 Jan 2023 23:04:52 +0000
4Subject: [PATCH] Fix build with GCC 13 (add missing <cstdint> include)
5
6GCC 13 (as usual for new compiler releases) shuffles around some
7internal includes and so <cstdint> is no longer transitively included.
8
9Explicitly include <cstdint> for uint8_t.
10
11```
12/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/host/include/uhd/rfnoc/defaults.hpp:43:14: error: 'uint32_t' does not name a type
13   43 | static const uint32_t DEFAULT_NOC_ID  = 0xFFFFFFFF;
14      |              ^~~~~~~~
15/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/host/include/uhd/rfnoc/defaults.hpp:1:1: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
16  +++ |+#include <cstdint>
17    1 | //
18```
19
20Signed-off-by: Sam James <sam@gentoo.org>
21
22Upstream: https://github.com/EttusResearch/uhd/commit/3acf784e988608cbce34cd0be0a8703ba53ea515
23Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
24---
25 host/include/uhd/cal/database.hpp                      | 1 +
26 host/include/uhd/rfnoc/defaults.hpp                    | 1 +
27 host/include/uhd/types/eeprom.hpp                      | 1 +
28 host/include/uhd/usrp/zbx_tune_map_item.hpp            | 1 +
29 host/lib/usrp/dboard/magnesium/magnesium_constants.hpp | 1 +
30 host/lib/usrp/dboard/rhodium/rhodium_constants.hpp     | 1 +
31 host/lib/utils/serial_number.cpp                       | 1 +
32 7 files changed, 7 insertions(+)
33
34diff --git a/host/include/uhd/cal/database.hpp b/host/include/uhd/cal/database.hpp
35index b6abbb6df7..9d47febedd 100644
36--- a/host/include/uhd/cal/database.hpp
37+++ b/host/include/uhd/cal/database.hpp
38@@ -8,6 +8,7 @@
39
40 #include <uhd/config.hpp>
41 #include <stddef.h>
42+#include <cstdint>
43 #include <string>
44 #include <vector>
45 #include <functional>
46diff --git a/host/include/uhd/rfnoc/defaults.hpp b/host/include/uhd/rfnoc/defaults.hpp
47index aa7778aacf..6c878a8d70 100644
48--- a/host/include/uhd/rfnoc/defaults.hpp
49+++ b/host/include/uhd/rfnoc/defaults.hpp
50@@ -8,6 +8,7 @@
51
52 #pragma once
53
54+#include <cstdint>
55 #include <string>
56
57 namespace uhd { namespace rfnoc {
58diff --git a/host/include/uhd/types/eeprom.hpp b/host/include/uhd/types/eeprom.hpp
59index 3a7605d3cb..420440aa64 100644
60--- a/host/include/uhd/types/eeprom.hpp
61+++ b/host/include/uhd/types/eeprom.hpp
62@@ -6,6 +6,7 @@
63
64 #pragma once
65
66+#include <cstdint>
67 #include <map>
68 #include <string>
69 #include <vector>
70diff --git a/host/include/uhd/usrp/zbx_tune_map_item.hpp b/host/include/uhd/usrp/zbx_tune_map_item.hpp
71index e49f49f785..ce95623de2 100644
72--- a/host/include/uhd/usrp/zbx_tune_map_item.hpp
73+++ b/host/include/uhd/usrp/zbx_tune_map_item.hpp
74@@ -6,6 +6,7 @@
75
76 #pragma once
77 #include <uhd/config.hpp>
78+#include <cstdint>
79 #include <cstring>
80 #include <string>
81 #include <vector>
82diff --git a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp
83index 99f2b910c6..99f5a4933f 100644
84--- a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp
85+++ b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp
86@@ -9,6 +9,7 @@
87
88 #include <uhd/types/ranges.hpp>
89 #include <cstddef>
90+#include <cstdint>
91 #include <string>
92 #include <vector>
93
94diff --git a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp
95index 591d02d305..1577e02d9e 100644
96--- a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp
97+++ b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp
98@@ -9,6 +9,7 @@
99
100 #include <array>
101 #include <cstddef>
102+#include <cstdint>
103 #include <string>
104 #include <vector>
105
106diff --git a/host/lib/utils/serial_number.cpp b/host/lib/utils/serial_number.cpp
107index 61296a9139..c07730e24d 100644
108--- a/host/lib/utils/serial_number.cpp
109+++ b/host/lib/utils/serial_number.cpp
110@@ -5,6 +5,7 @@
111 //
112
113 #include <uhdlib/utils/serial_number.hpp>
114+#include <cstdint>
115 #include <stdexcept>
116 #include <string>
117
118