diff options
| author | Zack Weinberg <zackw@panix.com> | 2016-11-27 12:36:16 -0500 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2016-11-27 12:36:16 -0500 |
| commit | b964e06640f62cf523e3808b68029d398692204a (patch) | |
| tree | c7abb03a1aeccbe384a0b63354d189e8951837f1 | |
| parent | 2dacdc5eb0171078eeb96b12b0761f533a62f70e (diff) | |
| download | glibc-b964e06640f62cf523e3808b68029d398692204a.tar.gz glibc-b964e06640f62cf523e3808b68029d398692204a.tar.xz glibc-b964e06640f62cf523e3808b68029d398692204a.zip | |
Minor problems exposed by compiling C++ tests under _ISOMAC.
* libio/libio.h: Use __USE_GNU, not _GNU_SOURCE, in a conditional. * test-skeleton.c: Include stdint.h to ensure uintptr_t is available.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libio/libio.h | 2 | ||||
| -rw-r--r-- | test-skeleton.c | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 8483b23861..4a7395cfa1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-11-27 Zack Weinberg <zackw@panix.com> + + * libio/libio.h: Use __USE_GNU, not _GNU_SOURCE, in a conditional. + * test-skeleton.c: Include stdint.h to ensure uintptr_t is available. + 2016-11-27 Samuel Thibault <samuel.thibault@ens-lyon.org> * hurd/hurd/signal.h (HURD_MSGPORT_RPC): Cast expressions results to diff --git a/libio/libio.h b/libio/libio.h index efd09f120b..f4ead83c4a 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -353,7 +353,7 @@ typedef int __io_seek_fn (void *__cookie, _IO_off64_t *__pos, int __w); 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 fa457befa5..154096fd8e 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 |