aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/unix/sysv/linux/dl-osinfo.h5
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b377dd668..b912b5cbcb 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 f327161b7a..7fc0259ae4 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,