Bruno Haible <br...@clisp.org> writes: > Small nit: The three comments /* Android & OpenBSD */ > hurt my feelings as a mathematician. I know that "&" is colloquially spoken > as "and", but when it's to describe a preprocessor condition, that symbol > feels wrong. Could you please use "|" or "," instead?
Upon a second look I am not really sure why I wrote it that way, since the rest of the comments are split with a comma. It looks quite strange. Fixed with the attached, thanks. Collin
>From dd8fae4b6fbf2474cd4f3b50cbc8da54a41fce9f Mon Sep 17 00:00:00 2001 Message-ID: <dd8fae4b6fbf2474cd4f3b50cbc8da54a41fce9f.1753080721.git.collin.fu...@gmail.com> From: Collin Funk <collin.fu...@gmail.com> Date: Sun, 20 Jul 2025 23:47:42 -0700 Subject: [PATCH] stdioext: Adjust some comments. Suggested by Bruno Haible in: <https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00161.html>. * lib/stdio-impl.h: In comments use a comma instead of an ampersand to separate items. --- ChangeLog | 6 ++++++ lib/stdio-impl.h | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9003983e2c..121b2b13a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2025-07-20 Collin Funk <collin.fu...@gmail.com> + stdioext: Adjust some comments. + Suggested by Bruno Haible in: + <https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00161.html>. + * lib/stdio-impl.h: In comments use a comma instead of an ampersand to + separate items. + stdioext: Port to recent OpenBSD snapshots with an incomplete FILE type. * lib/fbufmode.c (fbufmode): Check for __OpenBSD__ definition since __sferror is no longer defined publicly on this platform. diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h index 36295b9477..4abf9e68b2 100644 --- a/lib/stdio-impl.h +++ b/lib/stdio-impl.h @@ -108,7 +108,7 @@ # define _flags pub._flags # define _r pub._r # define _w pub._w -# elif defined __ANDROID__ || defined __OpenBSD__ /* Android & OpenBSD */ +# elif defined __ANDROID__ || defined __OpenBSD__ /* Android, OpenBSD */ # if defined __LP64__ && !defined __OpenBSD__ # define _gl_flags_file_t int # else @@ -165,7 +165,7 @@ /* More fields, not relevant here. */ }; # define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub -# elif defined __ANDROID__ || defined __OpenBSD__ /* Android & OpenBSD */ +# elif defined __ANDROID__ || defined __OpenBSD__ /* Android, OpenBSD */ struct __sfileext { struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */ @@ -178,7 +178,7 @@ # define HASUB(fp) (fp_ub._base != NULL) -# if defined __ANDROID__ || defined __OpenBSD__ /* Android & OpenBSD */ +# if defined __ANDROID__ || defined __OpenBSD__ /* Android, OpenBSD */ /* Needed after this Android commit from 2016-01-25 <https://android.googlesource.com/platform/bionic.git/+/e70e0e9267d069bf56a5078c99307e08a7280de7> And after this OpenBSD commit from 2025-07-16 -- 2.50.1
