summaryrefslogtreecommitdiff
path: root/libc/misc/dirent
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2006-02-26 13:14:36 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2006-02-26 13:14:36 +0000
commitdd5974db50c8bda6808c2a3488217c96ea250997 (patch)
tree9de4971fbd686db53aeddcacc3c14fbda6e6c832 /libc/misc/dirent
parent68737f0318058788f49a57980c884f69ed7ed687 (diff)
Use _lfs_64.h in all *64.c
Diffstat (limited to 'libc/misc/dirent')
-rw-r--r--libc/misc/dirent/alphasort64.c14
-rw-r--r--libc/misc/dirent/readdir64.c15
-rw-r--r--libc/misc/dirent/scandir64.c16
3 files changed, 4 insertions, 41 deletions
diff --git a/libc/misc/dirent/alphasort64.c b/libc/misc/dirent/alphasort64.c
index b17b4021d..86a91095d 100644
--- 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 71c299e6d..5386ee17e 100644
--- 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 44252b6f0..7b1dbd000 100644
--- 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 *),