1*4882a593SmuzhiyunFrom 135414a7f543e4d40ad0a7cbd51885e159a6e0f4 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Paul Eggert <eggert@cs.ucla.edu> 3*4882a593SmuzhiyunDate: Tue, 30 Nov 2021 17:50:01 -0800 4*4882a593SmuzhiyunSubject: sys_random: port better to uClibc < 1.0.35 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunProblem reported by Fabrice Fontaine in: 7*4882a593Smuzhiyunhttps://lists.gnu.org/r/bug-gnulib/2021-11/msg00043.html 8*4882a593Smuzhiyun* lib/sys_random.in.h [HAVE_SYS_RANDOM_H && !__GLIBC__ && __UCLIBC__]: 9*4882a593SmuzhiyunInclude <stddef.h>, in case this file is included before 10*4882a593Smuzhiyun__UCLIBC__ is defined. 11*4882a593Smuzhiyun 12*4882a593Smuzhiyun[Retrieved (and backported to remove ChangeLog update) from: 13*4882a593Smuzhiyunhttps://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=135414a7f543e4d40ad0a7cbd51885e159a6e0f4] 14*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 15*4882a593Smuzhiyun--- 16*4882a593Smuzhiyun ChangeLog | 9 +++++++++ 17*4882a593Smuzhiyun lib/sys_random.in.h | 6 ++++-- 18*4882a593Smuzhiyun 2 files changed, 13 insertions(+), 2 deletions(-) 19*4882a593Smuzhiyun 20*4882a593Smuzhiyundiff --git a/lib/sys_random.in.h b/lib/sys_random.in.h 21*4882a593Smuzhiyunindex 1abd6c544..8b4b934a1 100644 22*4882a593Smuzhiyun--- a/lib/sys_random.in.h 23*4882a593Smuzhiyun+++ b/lib/sys_random.in.h 24*4882a593Smuzhiyun@@ -23,8 +23,10 @@ 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun #if @HAVE_SYS_RANDOM_H@ 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun-/* On uClibc, <sys/random.h> assumes prior inclusion of <stddef.h>. */ 29*4882a593Smuzhiyun-# if defined __UCLIBC__ 30*4882a593Smuzhiyun+/* On uClibc < 1.0.35, <sys/random.h> assumes prior inclusion of <stddef.h>. 31*4882a593Smuzhiyun+ Do not use __UCLIBC__ here, as it might not be defined yet. 32*4882a593Smuzhiyun+ But avoid namespace pollution on glibc systems. */ 33*4882a593Smuzhiyun+# ifndef __GLIBC__ 34*4882a593Smuzhiyun # include <stddef.h> 35*4882a593Smuzhiyun # endif 36*4882a593Smuzhiyun /* On Mac OS X 10.5, <sys/random.h> assumes prior inclusion of <sys/types.h>. 37*4882a593Smuzhiyun-- 38*4882a593Smuzhiyuncgit v1.2.1 39*4882a593Smuzhiyun 40