Merge branch 'maint'

3 files changed, 12 insertions, 11 deletions

diff --git a/host/utils/b2xx_fx3_utils.cpp b/host/utils/b2xx_fx3_utils.cpp
index d5f829c80..0d0eaa743 100644
--- a/host/utils/b2xx_fx3_utils.cpp
+++ b/host/utils/b2xx_fx3_utils.cpp
@@ -535,7 +535,7 @@ boost::int32_t main(boost::int32_t argc, char *argv[]) {
 
     } else if (vm.count("load-fpga")) {
         std::cout << "Loading FPGA image (" << fpga_file << ")" << std::endl;
-        uint32_t fx3_state;
+        boost::uint32_t fx3_state;
         try {fx3_state = b200->load_fpga(fpga_file);} // returns 0 on success, or FX3 state on error
         catch (uhd::exception &e) {
             std::cerr << "Exception while loading FPGA: " << e.what() << std::endl;
diff --git a/host/utils/nirio_programmer.cpp b/host/utils/nirio_programmer.cpp
index 98db862eb..199c08130 100644
--- a/host/utils/nirio_programmer.cpp
+++ b/host/utils/nirio_programmer.cpp
@@ -4,6 +4,7 @@
 #include <uhd/transport/nirio/nifpga_lvbitx.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <fcntl.h>
 #include <iostream>
 #include <fstream>
diff --git a/host/utils/usrp_n2xx_simple_net_burner.cpp b/host/utils/usrp_n2xx_simple_net_burner.cpp
index 5fad9b282..571c73ac8 100644
--- a/host/utils/usrp_n2xx_simple_net_burner.cpp
+++ b/host/utils/usrp_n2xx_simple_net_burner.cpp
@@ -95,20 +95,20 @@ typedef enum {
 } usrp2_fw_update_id_t;
 
 typedef struct {
-    uint32_t proto_ver;
-    uint32_t id;
-    uint32_t seq;
+    boost::uint32_t proto_ver;
+    boost::uint32_t id;
+    boost::uint32_t seq;
     union {
-        uint32_t ip_addr;
-        uint32_t hw_rev;
+        boost::uint32_t ip_addr;
+        boost::uint32_t hw_rev;
         struct {
-            uint32_t flash_addr;
-            uint32_t length;
-            uint8_t  data[256];
+            boost::uint32_t flash_addr;
+            boost::uint32_t length;
+            boost::uint8_t  data[256];
         } flash_args;
         struct {
-            uint32_t sector_size_bytes;
-            uint32_t memory_size_bytes;
+            boost::uint32_t sector_size_bytes;
+            boost::uint32_t memory_size_bytes;
         } flash_info_args;
     } data;
 } usrp2_fw_update_data_t;