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.

diff --git a/ChangeLog b/ChangeLog
index 9003983e2c230024ab15a1e804c724b44a10d85f..121b2b13a6e66856c552387c2965818e9887c55f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2025-07-20  Collin Funk  <collin.funk1@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 36295b94775019f10e458e41fecceb0ef4d2d5d2..4abf9e68b23a78fe004b7154494b891e9920a598 100644 (file)
--- 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