From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 23 Aug 2000 06:52:05 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~24753
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4246fd63d878e0d5ca5d4ae12e96b9409af4756;p=external%2Fglibc.git

Update.

2000-08-23  Andreas Jaeger  <aj@suse.de>

	* sysdeps/unix/sysv/linux/dl-osinfo.h: Include "kernel-features.h",
	otherwise __LINUX_KERNEL_VERSION might not be defined.
	(MIN): Define if not already defined.
---

diff --git a/ChangeLog b/ChangeLog
index 8b377dd..b912b5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-23  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/unix/sysv/linux/dl-osinfo.h: Include "kernel-features.h",
+	otherwise __LINUX_KERNEL_VERSION might not be defined.
+	(MIN): Define if not already defined.
+
 2000-08-22  Ulrich Drepper  <drepper@redhat.com>
 
 	* stdio-common/vfprintf.c: Handle %F format.
diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h
index f327161..7fc0259 100644
--- a/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ b/sysdeps/unix/sysv/linux/dl-osinfo.h
@@ -18,6 +18,11 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <sys/sysctl.h>
+#include "kernel-features.h"
+
+#ifndef MIN
+# define MIN(a,b) (((a)<(b))?(a):(b))
+#endif
 
 /* There is no prototype for __sysctl in that file.  */
 extern int __sysctl (int *name, int nlen, void *oldval,