- correct patch as will be sent to maintainers

Changed files:
    glibc-includes.patch -> 1.2

diff --git a/glibc-includes.patch b/glibc-includes.patch
index 9ec239c128d488a019d87ec57252c0524112293b..e9d12928df8b1de165ba4b1276ee6f891e22e67e 100644 (file)
--- a/glibc-includes.patch
+++ b/glibc-includes.patch
@@ -1,13 +1,21 @@
-diff -urN glibc-2.3.3.org/sysdeps/unix/sysv/linux/sys/sysctl.h glibc-2.3.3/sysdeps/unix/sysv/linux/sys/sysctl.h
---- glibc-2.3.3.org/sysdeps/unix/sysv/linux/sys/sysctl.h       2004-01-01 23:02:57.135529536 +0100
-+++ glibc-2.3.3/sysdeps/unix/sysv/linux/sys/sysctl.h   2004-01-01 23:03:08.005270785 +0100
-@@ -26,9 +26,6 @@
+--- glibc-2.3.3/sysdeps/unix/sysv/linux/sys/sysctl.h.orig      2004-02-08 19:03:25.000000000 +0000
++++ glibc-2.3.3/sysdeps/unix/sysv/linux/sys/sysctl.h   2004-02-08 19:03:14.000000000 +0000
+@@ -22,6 +22,9 @@
+ #include <features.h>
+ #define __need_size_t
+ #include <stddef.h>
++#include <linux/version.h>
++
++#ifndef LIBC_HEADERS_VERSION
+ /* Prevent more kernel headers than necessary to be included.  */
  #define _LINUX_KERNEL_H       1
  #define _LINUX_TYPES_H        1
- #define _LINUX_LIST_H 1
--/* We do need this one for the declarations in <linux/sysctl.h>,
--   since we've elided the inclusion of <linux/kernel.h> that gets them.  */
--#include <linux/compiler.h>
+@@ -29,6 +32,8 @@
+ /* We do need this one for the declarations in <linux/sysctl.h>,
+    since we've elided the inclusion of <linux/kernel.h> that gets them.  */
+ #include <linux/compiler.h>
++#endif
++
  #include <linux/sysctl.h>
  
  __BEGIN_DECLS