diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-12-16 04:54:52 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-12-16 04:54:52 +0000 |
| commit | 7dfaf230d2191da71f3078943ea09d014298e7b0 (patch) | |
| tree | 11b16e846adf904f804b8ce15937db12d08259d8 /libc/sysdeps/linux/ia64/bits | |
| parent | 1bcf527f5f8c94aac1b2e80b585898a7266293af (diff) | |
| download | uClibc-alpine-7dfaf230d2191da71f3078943ea09d014298e7b0.tar.bz2 uClibc-alpine-7dfaf230d2191da71f3078943ea09d014298e7b0.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libc/sysdeps/linux/ia64/bits')
| -rw-r--r-- | libc/sysdeps/linux/ia64/bits/fcntl.h | 4 | ||||
| -rw-r--r-- | libc/sysdeps/linux/ia64/bits/kernel_stat.h | 4 | ||||
| -rw-r--r-- | libc/sysdeps/linux/ia64/bits/syscalls.h | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/libc/sysdeps/linux/ia64/bits/fcntl.h b/libc/sysdeps/linux/ia64/bits/fcntl.h index 46b38937d..e7e7c3039 100644 --- a/libc/sysdeps/linux/ia64/bits/fcntl.h +++ b/libc/sysdeps/linux/ia64/bits/fcntl.h @@ -192,13 +192,14 @@ struct flock64 __BEGIN_DECLS -#if 0 /*def __USE_GNU*/ +#ifdef __USE_GNU /* Provide kernel hint to read ahead. */ extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count) __THROW; +#if 0 /* Selective file content synch'ing. */ extern int sync_file_range (int __fd, __off64_t __from, __off64_t __to, unsigned int __flags); @@ -215,6 +216,7 @@ extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags) /* In-kernel implementation of tee for pipe buffers. */ extern int tee (int __fdin, int __fdout, size_t __len, unsigned int __flags) __THROW; +#endif #endif 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/ia64/bits/syscalls.h b/libc/sysdeps/linux/ia64/bits/syscalls.h index 666468a7a..b9c45a741 100644 --- a/libc/sysdeps/linux/ia64/bits/syscalls.h +++ b/libc/sysdeps/linux/ia64/bits/syscalls.h @@ -26,11 +26,6 @@ # error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead." #endif -/* This includes the `__NR_<name>' syscall numbers taken from the Linux kernel - * header files. It also defines the traditional `SYS_<name>' macros for older - * programs. */ -#include <bits/sysnum.h> - #ifndef __ASSEMBLER__ #include <errno.h> |