public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] linux: Fix missing __convert_scm_timestamps (BZ #28860) Date: Thu, 3 Feb 2022 20:46:57 +0000 (GMT) [thread overview] Message-ID: <20220203204657.BDF003858D35@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0351c75c5f94134fcec0e778e8cf86d149f8bbfb commit 0351c75c5f94134fcec0e778e8cf86d149f8bbfb Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Thu Feb 3 16:52:52 2022 -0300 linux: Fix missing __convert_scm_timestamps (BZ #28860) Commit 948ce73b31 made recvmsg/recvmmsg to always call __convert_scm_timestamps for 64 bit time_t symbol, so adjust it to always build it for __TIMESIZE != 64. It fixes build for architecture with 32 bit time_t support when configured with minimum kernel of 5.1. (cherry-picked from 798d716df71fb23dc89d1d5dba1fc26a1b5c0024) Diff: --- sysdeps/unix/sysv/linux/convert_scm_timestamps.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c index 5d3c4199e0..953ce97bd2 100644 --- a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c +++ b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c @@ -16,9 +16,10 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ -#include <kernel-features.h> +#include <bits/wordsize.h> +#include <bits/timesize.h> -#ifndef __ASSUME_TIME64_SYSCALLS +#if __TIMESIZE != 64 # include <stdint.h> # include <string.h> # include <sys/socket.h>
reply other threads:[~2022-02-03 20:46 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220203204657.BDF003858D35@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).