Applied
> -----Original Message-----
> From: Gix, Brian
> Sent: Wednesday, February 27, 2019 10:13 AM
> To: linux-bluetooth@xxxxxxxxxxxxxxx
> Cc: Stotland, Inga <inga.stotland@xxxxxxxxx>; Gix, Brian
> <brian.gix@xxxxxxxxx>; marcel@xxxxxxxxxxxx
> Subject: [PATCH BlueZ] mesh: Fix type checking for 32 vs 64 bit systems
>
> ---
> mesh/cfgmod-server.c | 2 +-
> mesh/model.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c index
> 992d4ac6a..9dc82eef6 100644
> --- a/mesh/cfgmod-server.c
> +++ b/mesh/cfgmod-server.c
> @@ -1129,7 +1129,7 @@ static bool cfg_srv_pkt(uint16_t src, uint32_t dst,
> gettimeofday(&time_now, NULL);
> time_now.tv_sec -= hb->sub_start;
>
> - if (time_now.tv_sec >= hb->sub_period)
> + if (time_now.tv_sec >= (long int) hb->sub_period)
> time_now.tv_sec = 0;
> else
> time_now.tv_sec = hb->sub_period -
> time_now.tv_sec; diff --git a/mesh/model.c b/mesh/model.c index
> 1e302b73b..5940f6854 100644
> --- a/mesh/model.c
> +++ b/mesh/model.c
> @@ -414,15 +414,15 @@ static void cmplt(uint16_t remote, uint8_t status,
>
> gettimeofday(&tx_end, NULL);
> if (tx_end.tv_sec == tx_start.tv_sec) {
> - l_debug("Duration 0.%zu seconds",
> + l_debug("Duration 0.%6.6lu seconds",
> tx_end.tv_usec - tx_start.tv_usec);
> } else {
> if (tx_start.tv_usec > tx_end.tv_usec)
> - l_debug("Duration %zu.%zu seconds",
> + l_debug("Duration %lu.%6.6lu seconds",
> tx_end.tv_sec - tx_start.tv_sec - 1,
> tx_end.tv_usec + 1000000 -
> tx_start.tv_usec);
> else
> - l_debug("Duration %zu.%zu seconds",
> + l_debug("Duration %lu.%6.6lu seconds",
> tx_end.tv_sec - tx_start.tv_sec,
> tx_end.tv_usec - tx_start.tv_usec);
> }
> --
> 2.14.5
