From 20d9a83dac4fae8ed09215323f6149951340f24a Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Mon, 13 Apr 2020 14:25:52 +0200
Subject: [PATCH] fix printfs of 64bit numbers when compiling for 32 bit

this caused issues when compiling in 32bit on RPi2
---
 lib/src/common/time_prof.cc          | 9 +++++----
 srsue/src/phy/scell/intra_measure.cc | 2 +-
 srsue/src/stack/ue_stack_lte.cc      | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/src/common/time_prof.cc b/lib/src/common/time_prof.cc
index b427bd878..f5a1cd044 100644
--- a/lib/src/common/time_prof.cc
+++ b/lib/src/common/time_prof.cc
@@ -21,6 +21,7 @@
 
 #include "srslte/common/time_prof.h"
 #include <algorithm>
+#include <inttypes.h>
 #include <numeric>
 
 using namespace srslte;
@@ -72,8 +73,8 @@ void avg_time_stats::operator()(nanoseconds duration)
 {
   count++;
   avg_val = avg_val * (count - 1) / count + static_cast<double>(duration.count()) / count;
-  max_val = std::max(max_val, duration.count());
-  min_val = std::min(min_val, duration.count());
+  max_val = std::max<long>(max_val, duration.count());
+  min_val = std::min<long>(min_val, duration.count());
   if (count % print_period == 0) {
     log_ptr->info("%s: {mean, max, min}={%0.1f, %ld, %ld} usec, nof_samples=%ld",
                   name.c_str(),
@@ -99,7 +100,7 @@ void sliding_window_stats<TUnit>::operator()(nanoseconds duration)
   const char* unit_str = get_tunit_str<TUnit>();
   TUnit       dur      = std::chrono::duration_cast<TUnit>(duration);
 
-  log_ptr->debug("%s: duration=%ld %s\n", name.c_str(), dur.count(), unit_str);
+  log_ptr->debug("%s: duration=%" PRId64 " %s\n", name.c_str(), dur.count(), unit_str);
 
   sliding_window[window_idx++] = duration;
   if (window_idx == sliding_window.size()) {
@@ -108,7 +109,7 @@ void sliding_window_stats<TUnit>::operator()(nanoseconds duration)
     nanoseconds tmin  = *std::min_element(sliding_window.begin(), sliding_window.end());
     double      tmean = static_cast<double>(duration_cast<TUnit>(tsum).count()) / sliding_window.size();
 
-    log_ptr->info("%s: {mean, max, min} = {%0.2f, %ld, %ld} %s\n",
+    log_ptr->info("%s: {mean, max, min} = {%0.2f, %" PRId64 ", %" PRId64 "} %s\n",
                   name.c_str(),
                   tmean,
                   duration_cast<TUnit>(tmax).count(),
diff --git a/srsue/src/phy/scell/intra_measure.cc b/srsue/src/phy/scell/intra_measure.cc
index 505844aa0..03732c519 100644
--- a/srsue/src/phy/scell/intra_measure.cc
+++ b/srsue/src/phy/scell/intra_measure.cc
@@ -108,7 +108,7 @@ void intra_measure::set_cells_to_meas(const std::set<uint32_t>& pci)
   active_pci = pci;
   active_pci_mutex.unlock();
   state.set_state(internal_state::receive);
-  log_h->info("INTRA: Received list of %lu neighbour cells to measure in EARFCN %d.\n", pci.size(), current_earfcn);
+  log_h->info("INTRA: Received list of %zd neighbour cells to measure in EARFCN %d.\n", pci.size(), current_earfcn);
 }
 
 void intra_measure::write(uint32_t tti, cf_t* data, uint32_t nsamples)
diff --git a/srsue/src/stack/ue_stack_lte.cc b/srsue/src/stack/ue_stack_lte.cc
index 7591408a2..069a05eee 100644
--- a/srsue/src/stack/ue_stack_lte.cc
+++ b/srsue/src/stack/ue_stack_lte.cc
@@ -306,7 +306,7 @@ void ue_stack_lte::run_tti_impl(uint32_t tti, uint32_t tti_jump)
   if (args.have_tti_time_stats) {
     std::chrono::nanoseconds dur = tti_tprof.stop();
     if (dur > TTI_WARN_THRESHOLD_MS) {
-      mac_log->warning("%s: detected long duration=%ld ms\n",
+      mac_log->warning("%s: detected long duration=%" PRId64 "ms\n",
                        "proc_time",
                        std::chrono::duration_cast<std::chrono::milliseconds>(dur).count());
     }