From 217f0da0ed9bc24792791ad83133c6547acfc899 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 30 Nov 2021 17:50:01 -0800
Subject: [PATCH] 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.
---
 ChangeLog           | 9 +++++++++
 lib/sys_random.in.h | 6 ++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index efc289fa66..82819f801f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2021-11-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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.
+
 2021-11-27  Paul Eggert  <eggert@cs.ucla.edu>
 
 	gettext-h: document GNULIB_NO_VLA
diff --git a/lib/sys_random.in.h b/lib/sys_random.in.h
index 1abd6c544e..8b4b934a1e 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>.
-- 
2.33.1