From eb813ecafa2405e01e33da29d620e5c10ec63d2c Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Wed, 6 Dec 2006 20:22:42 +0000
Subject: bits/kernel_stat.h is for internal uClibc use only, fix a few other
 minor include file issues

---
 ldso/include/dl-syscall.h                        | 3 ++-
 libc/sysdeps/linux/alpha/bits/kernel_stat.h      | 4 ++++
 libc/sysdeps/linux/arm/bits/kernel_stat.h        | 4 ++++
 libc/sysdeps/linux/bfin/bits/kernel_stat.h       | 4 ++++
 libc/sysdeps/linux/common/pread_write.c          | 2 ++
 libc/sysdeps/linux/common/syscalls.h             | 1 +
 libc/sysdeps/linux/cris/bits/kernel_stat.h       | 4 ++++
 libc/sysdeps/linux/e1/bits/kernel_stat.h         | 4 ++++
 libc/sysdeps/linux/frv/bits/kernel_stat.h        | 4 ++++
 libc/sysdeps/linux/h8300/bits/kernel_stat.h      | 4 ++++
 libc/sysdeps/linux/hppa/bits/kernel_stat.h       | 4 ++++
 libc/sysdeps/linux/i386/bits/kernel_stat.h       | 4 ++++
 libc/sysdeps/linux/ia64/bits/kernel_stat.h       | 4 ++++
 libc/sysdeps/linux/m68k/bits/kernel_stat.h       | 4 ++++
 libc/sysdeps/linux/microblaze/bits/kernel_stat.h | 4 ++++
 libc/sysdeps/linux/mips/bits/kernel_stat.h       | 4 ++++
 libc/sysdeps/linux/nios2/bits/kernel_stat.h      | 4 ++++
 libc/sysdeps/linux/powerpc/bits/kernel_stat.h    | 4 ++++
 libc/sysdeps/linux/sh/bits/kernel_stat.h         | 4 ++++
 libc/sysdeps/linux/sh64/bits/kernel_stat.h       | 4 ++++
 libc/sysdeps/linux/sparc/bits/kernel_stat.h      | 4 ++++
 libc/sysdeps/linux/v850/bits/kernel_stat.h       | 4 ++++
 libc/sysdeps/linux/vax/bits/kernel_stat.h        | 4 ++++
 libc/sysdeps/linux/x86_64/bits/kernel_stat.h     | 4 ++++
 24 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h
index 5b85fd230..b42416a52 100644
--- a/ldso/include/dl-syscall.h
+++ b/ldso/include/dl-syscall.h
@@ -11,7 +11,8 @@
 /* Pull in the arch specific syscall implementation */
 #include <dl-syscalls.h>
 /*  For MAP_ANONYMOUS -- differs between platforms */
-#include <asm/mman.h>
+#define _SYS_MMAN_H 1
+#include <bits/mman.h>
 /* Pull in whatever this particular arch's kernel thinks the kernel version of
  * struct stat should look like.  It turns out that each arch has a different
  * opinion on the subject, and different kernel revs use different names... */
diff --git a/libc/sysdeps/linux/alpha/bits/kernel_stat.h b/libc/sysdeps/linux/alpha/bits/kernel_stat.h
index 5ab113b3b..9fcbc031a 100644
--- a/libc/sysdeps/linux/alpha/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/alpha/bits/kernel_stat.h
@@ -1,6 +1,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /* This file provides whatever this particular arch's kernel thinks 
  * struct kernel_stat should look like...  It turns out each arch has a 
  * different opinion on the subject... */
diff --git a/libc/sysdeps/linux/arm/bits/kernel_stat.h b/libc/sysdeps/linux/arm/bits/kernel_stat.h
index b58b28e30..b3f8c37d0 100644
--- a/libc/sysdeps/linux/arm/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/arm/bits/kernel_stat.h
@@ -1,6 +1,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /* This file provides whatever this particular arch's kernel thinks 
  * struct kernel_stat should look like...  It turns out each arch has a 
  * different opinion on the subject... */
diff --git a/libc/sysdeps/linux/bfin/bits/kernel_stat.h b/libc/sysdeps/linux/bfin/bits/kernel_stat.h
index 1bfdb8e44..2a59d8eea 100644
--- a/libc/sysdeps/linux/bfin/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/bfin/bits/kernel_stat.h
@@ -1,6 +1,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /* This file provides whatever this particular arch's kernel thinks 
  * struct kernel_stat should look like...  It turns out each arch has a 
  * different opinion on the subject... */
diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
index 2509b7ab6..709125505 100644
--- a/libc/sysdeps/linux/common/pread_write.c
+++ b/libc/sysdeps/linux/common/pread_write.c
@@ -24,6 +24,8 @@ extern __typeof(pread64) __libc_pread64;
 extern __typeof(pwrite64) __libc_pwrite64;
 #endif
 
+#include <bits/kernel_types.h>
+
 #ifdef __NR_pread
 
 # define __NR___syscall_pread __NR_pread 
diff --git a/libc/sysdeps/linux/common/syscalls.h b/libc/sysdeps/linux/common/syscalls.h
index af015246a..c4f6a44fd 100644
--- a/libc/sysdeps/linux/common/syscalls.h
+++ b/libc/sysdeps/linux/common/syscalls.h
@@ -21,3 +21,4 @@
 # undef __USE_FILE_OFFSET64
 #endif
 
+#include <bits/kernel_types.h>
diff --git a/libc/sysdeps/linux/cris/bits/kernel_stat.h b/libc/sysdeps/linux/cris/bits/kernel_stat.h
index d4be6a64d..50202e542 100644
--- a/libc/sysdeps/linux/cris/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/cris/bits/kernel_stat.h
@@ -3,6 +3,10 @@
 #ifndef _CRIS_STAT_H
 #define _CRIS_STAT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 struct __old_kernel_stat {
 	unsigned short st_dev;
 	unsigned short st_ino;
diff --git a/libc/sysdeps/linux/e1/bits/kernel_stat.h b/libc/sysdeps/linux/e1/bits/kernel_stat.h
index bfef64cea..908a153d8 100644
--- a/libc/sysdeps/linux/e1/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/e1/bits/kernel_stat.h
@@ -1,6 +1,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /* This file provides whatever this particular arch's kernel thinks 
  * struct kernel_stat should look like...  It turns out each arch has a 
  * different opinion on the subject... */
diff --git a/libc/sysdeps/linux/frv/bits/kernel_stat.h b/libc/sysdeps/linux/frv/bits/kernel_stat.h
index c6d61412d..51cb57eda 100644
--- a/libc/sysdeps/linux/frv/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/frv/bits/kernel_stat.h
@@ -1,6 +1,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /* This file provides whatever this particular arch's kernel thinks 
  * struct kernel_stat should look like...  It turns out each arch has a 
  * different opinion on the subject... */
diff --git a/libc/sysdeps/linux/h8300/bits/kernel_stat.h b/libc/sysdeps/linux/h8300/bits/kernel_stat.h
index c227a30d0..f589b1f66 100644
--- a/libc/sysdeps/linux/h8300/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/h8300/bits/kernel_stat.h
@@ -1,6 +1,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /* This file provides whatever this particular arch's kernel thinks 
  * struct kernel_stat should look like...  It turns out each arch has a 
  * different opinion on the subject... */
diff --git a/libc/sysdeps/linux/hppa/bits/kernel_stat.h b/libc/sysdeps/linux/hppa/bits/kernel_stat.h
index c64392037..51b5b0748 100644
--- a/libc/sysdeps/linux/hppa/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/hppa/bits/kernel_stat.h
@@ -4,6 +4,10 @@
 #ifndef _PARISC_STAT_H
 #define _PARISC_STAT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 struct kernel_stat {
 	unsigned int	st_dev;		/* dev_t is 32 bits on parisc */
 	ino_t		st_ino;		/* 32 bits */
diff --git a/libc/sysdeps/linux/i386/bits/kernel_stat.h b/libc/sysdeps/linux/i386/bits/kernel_stat.h
index a574bd5f4..9f659a47e 100644
--- a/libc/sysdeps/linux/i386/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/i386/bits/kernel_stat.h
@@ -1,6 +1,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /* This file provides whatever this particular arch's kernel thinks 
  * struct stat should look like...  It turns out each arch has a 
  * different opinion on the subject... */
diff --git a/libc/sysdeps/linux/ia64/bits/kernel_stat.h b/libc/sysdeps/linux/ia64/bits/kernel_stat.h
index b46369c3c..c67c92d16 100644
--- a/libc/sysdeps/linux/ia64/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/ia64/bits/kernel_stat.h
@@ -4,6 +4,10 @@
 #ifndef _ASM_IA64_STAT_H
 #define _ASM_IA64_STAT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /*
  * Modified 1998, 1999
  *	David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
diff --git a/libc/sysdeps/linux/m68k/bits/kernel_stat.h b/libc/sysdeps/linux/m68k/bits/kernel_stat.h
index 3d2805e7f..5f0514843 100644
--- a/libc/sysdeps/linux/m68k/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/m68k/bits/kernel_stat.h
@@ -1,6 +1,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /* This file provides whatever this particular arch's kernel thinks 
  * struct kernel_stat should look like...  It turns out each arch has a 
  * different opinion on the subject... */
diff --git a/libc/sysdeps/linux/microblaze/bits/kernel_stat.h b/libc/sysdeps/linux/microblaze/bits/kernel_stat.h
index e8ef01493..248345e8b 100644
--- a/libc/sysdeps/linux/microblaze/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/microblaze/bits/kernel_stat.h
@@ -3,6 +3,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 struct kernel_stat
 {
   __kernel_dev_t	st_dev;
diff --git a/libc/sysdeps/linux/mips/bits/kernel_stat.h b/libc/sysdeps/linux/mips/bits/kernel_stat.h
index 529894264..d2f748e37 100644
--- a/libc/sysdeps/linux/mips/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/mips/bits/kernel_stat.h
@@ -1,6 +1,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /* This file provides whatever this particular arch's kernel thinks 
  * struct kernel_stat should look like...  It turns out each arch has a 
  * different opinion on the subject... */
diff --git a/libc/sysdeps/linux/nios2/bits/kernel_stat.h b/libc/sysdeps/linux/nios2/bits/kernel_stat.h
index bfef64cea..908a153d8 100644
--- a/libc/sysdeps/linux/nios2/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/nios2/bits/kernel_stat.h
@@ -1,6 +1,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /* This file provides whatever this particular arch's kernel thinks 
  * struct kernel_stat should look like...  It turns out each arch has a 
  * different opinion on the subject... */
diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_stat.h b/libc/sysdeps/linux/powerpc/bits/kernel_stat.h
index 556ffe2dd..d3c3f911c 100644
--- a/libc/sysdeps/linux/powerpc/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/powerpc/bits/kernel_stat.h
@@ -1,6 +1,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /* This file provides whatever this particular arch's kernel thinks 
  * struct kernel_stat should look like...  It turns out each arch has a 
  * different opinion on the subject... */
diff --git a/libc/sysdeps/linux/sh/bits/kernel_stat.h b/libc/sysdeps/linux/sh/bits/kernel_stat.h
index c841b0cee..8a29b3f5f 100644
--- a/libc/sysdeps/linux/sh/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/sh/bits/kernel_stat.h
@@ -1,6 +1,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /* This file provides whatever this particular arch's kernel thinks 
  * struct kernel_stat should look like...  It turns out each arch has a 
  * different opinion on the subject... */
diff --git a/libc/sysdeps/linux/sh64/bits/kernel_stat.h b/libc/sysdeps/linux/sh64/bits/kernel_stat.h
index 036448e6d..cde7bc880 100644
--- a/libc/sysdeps/linux/sh64/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/sh64/bits/kernel_stat.h
@@ -3,6 +3,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 struct kernel_stat {
 	unsigned short st_dev;
 	unsigned short __pad1;
diff --git a/libc/sysdeps/linux/sparc/bits/kernel_stat.h b/libc/sysdeps/linux/sparc/bits/kernel_stat.h
index 2f6e13d66..ac167fadd 100644
--- a/libc/sysdeps/linux/sparc/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/sparc/bits/kernel_stat.h
@@ -1,6 +1,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /* This file provides whatever this particular arch's kernel thinks 
  * struct kernel_stat should look like...  It turns out each arch has a 
  * different opinion on the subject... */
diff --git a/libc/sysdeps/linux/v850/bits/kernel_stat.h b/libc/sysdeps/linux/v850/bits/kernel_stat.h
index 5e55ed01d..02343ed48 100644
--- a/libc/sysdeps/linux/v850/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/v850/bits/kernel_stat.h
@@ -3,6 +3,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 struct kernel_stat
 {
   __kernel_dev_t	st_dev;
diff --git a/libc/sysdeps/linux/vax/bits/kernel_stat.h b/libc/sysdeps/linux/vax/bits/kernel_stat.h
index ece9d347b..2b5cb28f2 100644
--- a/libc/sysdeps/linux/vax/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/vax/bits/kernel_stat.h
@@ -1,6 +1,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /* This file provides whatever this particular arch's kernel thinks
  * struct stat should look like...  It turns out each arch has a
  * different opinion on the subject... */
diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_stat.h b/libc/sysdeps/linux/x86_64/bits/kernel_stat.h
index 84125b917..a2af2cd37 100644
--- a/libc/sysdeps/linux/x86_64/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/x86_64/bits/kernel_stat.h
@@ -4,6 +4,10 @@
 #ifndef _ASM_X86_64_STAT_H
 #define _ASM_X86_64_STAT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 #define STAT_HAVE_NSEC 1
 
 struct kernel_stat {
-- 
cgit v1.2.3