This is the mail archive of the mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] Always suppress libc-internal declarations for C++ code.

On Sun, Nov 27, 2016 at 1:50 AM, Mike Frysinger <> wrote:
> On 21 Nov 2016 12:42, Zack Weinberg wrote:
>> This flushed out some minor problems: test-skeleton.c uses uintptr_t
>> but wasn't including <stdint.h>
> seems like this should be installed as obvious by itself

Done (patch appended)

>> libio.h tested _GNU_SOURCE instead of __USE_GNU in one place.
> makes sense regardless too

Also done

> a quick grep shows fnmatch.h has a similar error

Isn't fnmatch.h shared with gnulib?  I don't feel like I understand
the constraints on code shared with gnulib, certainly not enough to
call it "obvious."  Also, some of the conditionals in there don't make
sense to me ("#if !defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 2 ||
defined _GNU_SOURCE" -- what's that even supposed to do?)


        * libio/libio.h: Use __USE_GNU, not _GNU_SOURCE, in a conditional.
        * test-skeleton.c: Include stdint.h to ensure uintptr_t is available.

diff --git a/libio/libio.h b/libio/libio.h
index efd09f1..f4ead83 100644
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -353,7 +353,7 @@ typedef int __io_seek_fn
 typedef int __io_close_fn (void *__cookie);

-#ifdef _GNU_SOURCE
+#ifdef __USE_GNU
 /* User-visible names for the above.  */
 typedef __io_read_fn cookie_read_function_t;
 typedef __io_write_fn cookie_write_function_t;
diff --git a/test-skeleton.c b/test-skeleton.c
index fa457be..154096f 100644
--- a/test-skeleton.c
+++ b/test-skeleton.c
@@ -33,6 +33,7 @@
 #include <sys/wait.h>
 #include <sys/param.h>
 #include <time.h>
+#include <stdint.h>

 /* The test function is normally called `do_test' and it is called
    with argc and argv as the arguments.  We nevertheless provide the

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]