From d958ebdfa9935edefd4c3ec2ac3087a841227ea9 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Thu, 23 Feb 2006 22:50:45 +0000 Subject: Move common parts into internal header, should it be used for all *64.c? --- libc/sysdeps/linux/common/_lfs_64.h | 29 +++++++++++++++++++++++++++++ libc/sysdeps/linux/common/creat64.c | 20 +++----------------- libc/sysdeps/linux/common/getrlimit64.c | 15 +-------------- libc/sysdeps/linux/common/mmap64.c | 21 ++++----------------- libc/sysdeps/linux/common/setrlimit64.c | 15 +-------------- 5 files changed, 38 insertions(+), 62 deletions(-) create mode 100644 libc/sysdeps/linux/common/_lfs_64.h (limited to 'libc/sysdeps') diff --git a/libc/sysdeps/linux/common/_lfs_64.h b/libc/sysdeps/linux/common/_lfs_64.h new file mode 100644 index 000000000..2d017b44e --- /dev/null +++ b/libc/sysdeps/linux/common/_lfs_64.h @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2000-2006 Erik Andersen + * + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. + */ +#include + +#ifdef __UCLIBC_HAS_LFS__ + +#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 +#undef _FILE_OFFSET_BITS +#define _FILE_OFFSET_BITS 64 +#endif + +#ifndef __USE_LARGEFILE64 +# define __USE_LARGEFILE64 1 +#endif + +/* We absolutely do _NOT_ want interfaces silently + * * renamed under us or very bad things will happen... */ +#ifdef __USE_FILE_OFFSET64 +# undef __USE_FILE_OFFSET64 +#endif + +#else + +# error Don't include this header in files not built when LFS is disabled + +#endif diff --git a/libc/sysdeps/linux/common/creat64.c b/libc/sysdeps/linux/common/creat64.c index 0bf20f175..3a176aa60 100644 --- a/libc/sysdeps/linux/common/creat64.c +++ b/libc/sysdeps/linux/common/creat64.c @@ -16,25 +16,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include +#include "_lfs_64.h" + +#ifdef __UCLIBC_HAS_LFS__ #include #include -#if defined __UCLIBC_HAS_LFS__ - -#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 -#undef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 64 -#endif -#ifndef __USE_LARGEFILE64 -# define __USE_LARGEFILE64 1 -#endif -/* We absolutely do _NOT_ want interfaces silently - * * renamed under us or very bad things will happen... */ -#ifdef __USE_FILE_OFFSET64 -# undef __USE_FILE_OFFSET64 -#endif - libc_hidden_proto(open64) /* Create FILE with protections MODE. */ @@ -43,4 +30,3 @@ int creat64 (const char *file, mode_t mode) return open64 (file, O_WRONLY|O_CREAT|O_TRUNC, mode); } #endif /* __UCLIBC_HAS_LFS__ */ - diff --git a/libc/sysdeps/linux/common/getrlimit64.c b/libc/sysdeps/linux/common/getrlimit64.c index d134287d5..8280cb775 100644 --- a/libc/sysdeps/linux/common/getrlimit64.c +++ b/libc/sysdeps/linux/common/getrlimit64.c @@ -16,20 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include - -#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 -#undef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 64 -#endif -#ifndef __USE_LARGEFILE64 -# define __USE_LARGEFILE64 1 -#endif -/* We absolutely do _NOT_ want interfaces silently - * renamed under us or very bad things will happen... */ -#ifdef __USE_FILE_OFFSET64 -# undef __USE_FILE_OFFSET64 -#endif +#include "_lfs_64.h" #include #include diff --git a/libc/sysdeps/linux/common/mmap64.c b/libc/sysdeps/linux/common/mmap64.c index 0ae0e7ebc..a0e04d5b1 100644 --- a/libc/sysdeps/linux/common/mmap64.c +++ b/libc/sysdeps/linux/common/mmap64.c @@ -5,31 +5,18 @@ */ /* Massivly hacked up for uClibc by Erik Andersen */ -#include +#include "_lfs_64.h" + +#ifdef __UCLIBC_HAS_LFS__ + #include #include #include #include #include -#ifdef __UCLIBC_HAS_LFS__ - libc_hidden_proto(mmap) -#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 -# undef _FILE_OFFSET_BITS -# define _FILE_OFFSET_BITS 64 -#endif -#ifndef __USE_LARGEFILE64 -# define __USE_LARGEFILE64 1 -#endif -/* We absolutely do _NOT_ want interfaces silently - * renamed under us or very bad things will happen... - */ -#ifdef __USE_FILE_OFFSET64 -# undef __USE_FILE_OFFSET64 -#endif - # if !defined __NR_mmap2 || !defined _syscall6 /* diff --git a/libc/sysdeps/linux/common/setrlimit64.c b/libc/sysdeps/linux/common/setrlimit64.c index 9b338f094..14514b813 100644 --- a/libc/sysdeps/linux/common/setrlimit64.c +++ b/libc/sysdeps/linux/common/setrlimit64.c @@ -16,20 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include - -#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 -#undef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 64 -#endif -#ifndef __USE_LARGEFILE64 -# define __USE_LARGEFILE64 1 -#endif -/* We absolutely do _NOT_ want interfaces silently - * renamed under us or very bad things will happen... */ -#ifdef __USE_FILE_OFFSET64 -# undef __USE_FILE_OFFSET64 -#endif +#include "_lfs_64.h" #include #include -- cgit v1.2.3