osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/40933?usp=email )
Change subject: Fix building for debian 13 armv7l
......................................................................
Fix building for debian 13 armv7l
In Debian 13 armv7l, time_t and suseconds_t are "long long int" instead
of "long unsigned int" as seen on x86_64 and aarch64. Fix it by casting
to "long unsigned int".
Related: OS#6828
Change-Id: I416b31dd11a82ad52f6a662d7e099123a5c77fff
(cherry picked from commit 8baa7cec367a43cb1f22016e3e2192abdcd9fe8c)
---
M src/ipaccess/ipaccess-config.c
M src/osmo-bsc/bts_ctrl.c
M tests/acc/acc_test.c
M tests/paging/paging_test.c
4 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c
index a576ebc..27d536a 100644
--- a/src/ipaccess/ipaccess-config.c
+++ b/src/ipaccess/ipaccess-config.c
@@ -879,7 +879,7 @@
printf("\taddr1: 0x%x\n",
ntohl(sub_entry->header_entry.addr1));
printf("\taddr2: 0x%x\n",
ntohl(sub_entry->header_entry.addr2));
printf("\tstart: 0x%x\n",
ntohl(sub_entry->header_entry.start));
- printf("\tabs. offset: 0x%lx\n",
sub_entry->absolute_offset);
+ printf("\tabs. offset: 0x%lx\n", (unsigned int long)
sub_entry->absolute_offset);
printf("\n\n");
dump_entry(sub_entry, part++, fd);
diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c
index 76806f4..2efa661 100644
--- a/src/osmo-bsc/bts_ctrl.c
+++ b/src/osmo-bsc/bts_ctrl.c
@@ -130,7 +130,7 @@
curloc = llist_first_entry(&bts->loc_list, struct bts_location, list);
- cmd->reply = talloc_asprintf(cmd, "%lu,%s,%f,%f,%f", curloc->tstamp,
+ cmd->reply = talloc_asprintf(cmd, "%lu,%s,%f,%f,%f", (unsigned int
long) curloc->tstamp,
get_value_string(bts_loc_fix_names, curloc->valid),
curloc->lat, curloc->lon, curloc->height);
if (!cmd->reply) {
cmd->reply = "OOM";
diff --git a/tests/acc/acc_test.c b/tests/acc/acc_test.c
index 84a63b0..2f910c4 100644
--- a/tests/acc/acc_test.c
+++ b/tests/acc/acc_test.c
@@ -36,7 +36,7 @@
struct timeval tv;
osmo_gettimeofday(&tv, NULL);
fprintf(stderr, "sys={%lu.%06lu}: %s\n",
- tv.tv_sec, tv.tv_usec, str);
+ (unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec,
str);
}
#define bts_init(net) _bts_init(net, __func__)
diff --git a/tests/paging/paging_test.c b/tests/paging/paging_test.c
index dae3499..60180b1 100644
--- a/tests/paging/paging_test.c
+++ b/tests/paging/paging_test.c
@@ -42,7 +42,7 @@
struct timeval tv;
osmo_gettimeofday(&tv, NULL);
fprintf(stderr, "sys={%lu.%06lu}: %s\n",
- tv.tv_sec, tv.tv_usec, str);
+ (unsigned int long) tv.tv_sec, (unsigned int long) tv.tv_usec,
str);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/40933?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-bsc
Gerrit-Branch: osmith/1.13.1
Gerrit-Change-Id: I416b31dd11a82ad52f6a662d7e099123a5c77fff
Gerrit-Change-Number: 40933
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osm...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: osmith <osm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-CC: daniel <dwillm...@sysmocom.de>
