From 4635b1c42752067cd516ea6ec6f955bed757157d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 29 Nov 2022 22:51:31 -0800 Subject: [PATCH] opensaf: Check for _FILE_OFFSET_BITS instead of __TIMESIZE This is fixing both LFS as well as 64bit time_t issue in one go Signed-off-by: Khem Raj --- ...0001-Use-correct-printf-format-for-__fsblkcnt_t.patch | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Use-correct-printf-format-for-__fsblkcnt_t.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Use-correct-printf-format-for-__fsblkcnt_t.patch index 0e113f533f..d44ceb0d2e 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Use-correct-printf-format-for-__fsblkcnt_t.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Use-correct-printf-format-for-__fsblkcnt_t.patch @@ -15,15 +15,13 @@ Signed-off-by: Khem Raj src/base/os_defs.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/src/base/os_defs.c b/src/base/os_defs.c -index 83458c2..655c190 100644 --- a/src/base/os_defs.c +++ b/src/base/os_defs.c -@@ -917,7 +917,11 @@ uint32_t ncs_os_posix_shm(NCS_OS_POSIX_SHM_REQ_INFO *req) +@@ -917,7 +917,11 @@ uint32_t ncs_os_posix_shm(NCS_OS_POSIX_S ((statsvfs.f_bfree - 1) * statsvfs.f_frsize)) { syslog( LOG_ERR, -+#if __TIMESIZE == 64 && __WORDSIZE == 32 ++#if _FILE_OFFSET_BITS == 64 && __WORDSIZE == 32 + "Insufficient shared memory (%lld) to write the data of size: %" PRId64 +#else "Insufficient shared memory (%ld) to write the data of size: %" PRId64 @@ -31,6 +29,3 @@ index 83458c2..655c190 100644 "\n", (statsvfs.f_bfree * statsvfs.f_frsize), req->info.write.i_write_size); --- -2.29.2 -