From 3115acd52e673e9ef51c8da87da454f9deab28ad Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Sun, 26 Feb 2006 13:08:32 +0000
Subject: Move _lfs_64.h to include and adapt files

---
 Makefile.in                             |  1 +
 include/_lfs_64.h                       | 29 +++++++++++++++++++++++++++++
 libc/sysdeps/linux/common/_lfs_64.h     | 29 -----------------------------
 libc/sysdeps/linux/common/creat64.c     |  2 +-
 libc/sysdeps/linux/common/getrlimit64.c |  2 +-
 libc/sysdeps/linux/common/mmap64.c      |  2 +-
 libc/sysdeps/linux/common/setrlimit64.c |  2 +-
 7 files changed, 34 insertions(+), 33 deletions(-)
 create mode 100644 include/_lfs_64.h
 delete mode 100644 libc/sysdeps/linux/common/_lfs_64.h

diff --git a/Makefile.in b/Makefile.in
index c3c5bc381..aea087848 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -124,6 +124,7 @@ install_headers:
 	printf '#ifndef _LIBC_INTERNAL_H\n#define _LIBC_INTERNAL_H 1\n#endif\n' > \
 		$(PREFIX)$(DEVEL_PREFIX)include/libc-internal.h
 	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/dl-osinfo.h
+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/_lfs_64.h
 	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/uClibc_uintmaxtostr.h
 ifneq ($(UCLIBC_HAS_FLOATS),y)
 	# Remove floating point related headers since float support is disabled.
diff --git a/include/_lfs_64.h b/include/_lfs_64.h
new file mode 100644
index 000000000..2d017b44e
--- /dev/null
+++ b/include/_lfs_64.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
+#include <features.h>
+
+#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/_lfs_64.h b/libc/sysdeps/linux/common/_lfs_64.h
deleted file mode 100644
index 2d017b44e..000000000
--- a/libc/sysdeps/linux/common/_lfs_64.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
- *
- * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- */
-#include <features.h>
-
-#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 3a176aa60..c1f250832 100644
--- a/libc/sysdeps/linux/common/creat64.c
+++ b/libc/sysdeps/linux/common/creat64.c
@@ -16,7 +16,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include "_lfs_64.h"
+#include <_lfs_64.h>
 
 #ifdef __UCLIBC_HAS_LFS__
 #include <fcntl.h>
diff --git a/libc/sysdeps/linux/common/getrlimit64.c b/libc/sysdeps/linux/common/getrlimit64.c
index 8280cb775..ca7aa7310 100644
--- a/libc/sysdeps/linux/common/getrlimit64.c
+++ b/libc/sysdeps/linux/common/getrlimit64.c
@@ -16,7 +16,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include "_lfs_64.h"
+#include <_lfs_64.h>
 
 #include <sys/types.h>
 #include <sys/resource.h>
diff --git a/libc/sysdeps/linux/common/mmap64.c b/libc/sysdeps/linux/common/mmap64.c
index a0e04d5b1..2cf200dc9 100644
--- a/libc/sysdeps/linux/common/mmap64.c
+++ b/libc/sysdeps/linux/common/mmap64.c
@@ -5,7 +5,7 @@
  */
 /* Massivly hacked up for uClibc by Erik Andersen */
 
-#include "_lfs_64.h"
+#include <_lfs_64.h>
 
 #ifdef __UCLIBC_HAS_LFS__
 
diff --git a/libc/sysdeps/linux/common/setrlimit64.c b/libc/sysdeps/linux/common/setrlimit64.c
index 14514b813..90b8eebd7 100644
--- a/libc/sysdeps/linux/common/setrlimit64.c
+++ b/libc/sysdeps/linux/common/setrlimit64.c
@@ -16,7 +16,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include "_lfs_64.h"
+#include <_lfs_64.h>
 
 #include <sys/types.h>
 #include <sys/resource.h>
-- 
cgit v1.2.3