Use _lfs_64.h in all *64.c

diff --git a/libc/misc/dirent/alphasort64.c b/libc/misc/dirent/alphasort64.c
index b17b402..86a9109 100644 (file)
--- a/libc/misc/dirent/alphasort64.c
+++ b/libc/misc/dirent/alphasort64.c
@@ -4,20 +4,8 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include <features.h>
+#include <_lfs_64.h>
 
-#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 <dirent.h>
 #include <string.h>
 #include "dirstream.h"

diff --git a/libc/misc/dirent/readdir64.c b/libc/misc/dirent/readdir64.c
index 71c299e..5386ee1 100644 (file)
--- a/libc/misc/dirent/readdir64.c
+++ b/libc/misc/dirent/readdir64.c
@@ -4,20 +4,8 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include <features.h>
+#include <_lfs_64.h>
 
-#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 <dirent.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -27,7 +15,6 @@
 #include "dirstream.h"
 
 libc_hidden_proto(readdir64)
-
 struct dirent64 *readdir64(DIR * dir)
 {
        ssize_t bytes;

diff --git a/libc/misc/dirent/scandir64.c b/libc/misc/dirent/scandir64.c
index 44252b6..7b1dbd0 100644 (file)
--- a/libc/misc/dirent/scandir64.c
+++ b/libc/misc/dirent/scandir64.c
@@ -20,20 +20,7 @@
 /* Modified for uClibc by Erik Andersen
    */
 
-#include <features.h>
-
-#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 <dirent.h>
 #include <stdio.h>
@@ -47,6 +34,7 @@ libc_hidden_proto(memcpy)
 libc_hidden_proto(opendir)
 libc_hidden_proto(closedir)
 libc_hidden_proto(qsort)
+libc_hidden_proto(readdir64)
 
 int scandir64(const char *dir, struct dirent64 ***namelist, 
        int (*selector) (const struct dirent64 *),