| From 135414a7f543e4d40ad0a7cbd51885e159a6e0f4 Mon Sep 17 00:00:00 2001 |
| From: Paul Eggert <eggert@cs.ucla.edu> |
| Date: Tue, 30 Nov 2021 17:50:01 -0800 |
| Subject: sys_random: port better to uClibc < 1.0.35 |
| |
| Problem reported by Fabrice Fontaine in: |
| https://lists.gnu.org/r/bug-gnulib/2021-11/msg00043.html |
| * lib/sys_random.in.h [HAVE_SYS_RANDOM_H && !__GLIBC__ && __UCLIBC__]: |
| Include <stddef.h>, in case this file is included before |
| __UCLIBC__ is defined. |
| |
| [Retrieved (and backported to remove ChangeLog update) from: |
| https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=135414a7f543e4d40ad0a7cbd51885e159a6e0f4] |
| Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
| --- |
| ChangeLog | 9 +++++++++ |
| lib/sys_random.in.h | 6 ++++-- |
| 2 files changed, 13 insertions(+), 2 deletions(-) |
| |
| diff --git a/lib/sys_random.in.h b/lib/sys_random.in.h |
| index 1abd6c544..8b4b934a1 100644 |
| --- a/lib/sys_random.in.h |
| +++ b/lib/sys_random.in.h |
| @@ -23,8 +23,10 @@ |
| |
| #if @HAVE_SYS_RANDOM_H@ |
| |
| -/* On uClibc, <sys/random.h> assumes prior inclusion of <stddef.h>. */ |
| -# if defined __UCLIBC__ |
| +/* On uClibc < 1.0.35, <sys/random.h> assumes prior inclusion of <stddef.h>. |
| + Do not use __UCLIBC__ here, as it might not be defined yet. |
| + But avoid namespace pollution on glibc systems. */ |
| +# ifndef __GLIBC__ |
| # include <stddef.h> |
| # endif |
| /* On Mac OS X 10.5, <sys/random.h> assumes prior inclusion of <sys/types.h>. |
| -- |
| cgit v1.2.1 |
| |
