svn commit: trunk/uClibc/libc/misc/dirent
psm at uclibc.org
psm at uclibc.org
Fri Dec 16 00:11:55 UTC 2005
Author: psm
Date: 2005-12-15 16:10:58 -0800 (Thu, 15 Dec 2005)
New Revision: 12906
Log:
Build x64 versions only if LFS is enabled
Modified:
trunk/uClibc/libc/misc/dirent/Makefile.in
trunk/uClibc/libc/misc/dirent/alphasort64.c
trunk/uClibc/libc/misc/dirent/dirstream.h
trunk/uClibc/libc/misc/dirent/readdir.c
trunk/uClibc/libc/misc/dirent/readdir64.c
trunk/uClibc/libc/misc/dirent/readdir64_r.c
trunk/uClibc/libc/misc/dirent/scandir64.c
Changeset:
Modified: trunk/uClibc/libc/misc/dirent/Makefile.in
===================================================================
--- trunk/uClibc/libc/misc/dirent/Makefile.in 2005-12-15 20:05:52 UTC (rev 12905)
+++ trunk/uClibc/libc/misc/dirent/Makefile.in 2005-12-16 00:10:58 UTC (rev 12906)
@@ -7,9 +7,12 @@
#
CSRC:= alphasort.c closedir.c dirfd.c opendir.c readdir.c rewinddir.c scandir.c \
- seekdir.c telldir.c readdir64.c alphasort64.c scandir64.c readdir_r.c \
- readdir64_r.c
+ seekdir.c telldir.c readdir_r.c
+ifeq ($(UCLIBC_HAS_LFS),y)
+CSRC+= readdir64.c alphasort64.c scandir64.c readdir64_r.c
+endif
+
MISC_DIRENT_DIR:=$(top_srcdir)libc/misc/dirent
MISC_DIRENT_OUT:=$(top_builddir)libc/misc/dirent
Modified: trunk/uClibc/libc/misc/dirent/alphasort64.c
===================================================================
--- trunk/uClibc/libc/misc/dirent/alphasort64.c 2005-12-15 20:05:52 UTC (rev 12905)
+++ trunk/uClibc/libc/misc/dirent/alphasort64.c 2005-12-16 00:10:58 UTC (rev 12906)
@@ -1,5 +1,5 @@
#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
@@ -22,5 +22,3 @@
return __strcmp ((*(const struct dirent64 **) a)->d_name,
(*(const struct dirent64 **) b)->d_name);
}
-#endif /* __UCLIBC_HAS_LFS__ */
-
Modified: trunk/uClibc/libc/misc/dirent/dirstream.h
===================================================================
--- trunk/uClibc/libc/misc/dirent/dirstream.h 2005-12-15 20:05:52 UTC (rev 12905)
+++ trunk/uClibc/libc/misc/dirent/dirstream.h 2005-12-16 00:10:58 UTC (rev 12906)
@@ -72,8 +72,10 @@
extern ssize_t __getdents(int fd, char *buf, size_t count) attribute_hidden;
+extern struct dirent *__readdir (DIR *__dirp) __nonnull ((1)) attribute_hidden;
#ifdef __UCLIBC_HAS_LFS__
extern ssize_t __getdents64 (int fd, char *buf, size_t count) attribute_hidden;
+extern struct dirent64 *__readdir64 (DIR *__dirp) __nonnull ((1)) attribute_hidden;
#endif
#endif /* dirent.h */
Modified: trunk/uClibc/libc/misc/dirent/readdir.c
===================================================================
--- trunk/uClibc/libc/misc/dirent/readdir.c 2005-12-15 20:05:52 UTC (rev 12905)
+++ trunk/uClibc/libc/misc/dirent/readdir.c 2005-12-16 00:10:58 UTC (rev 12906)
@@ -1,3 +1,5 @@
+#include <features.h>
+
#include <errno.h>
#include <stdlib.h>
#include <string.h>
@@ -5,7 +7,6 @@
#include <dirent.h>
#include "dirstream.h"
-#undef readdir
struct dirent attribute_hidden *__readdir(DIR * dir)
{
ssize_t bytes;
Modified: trunk/uClibc/libc/misc/dirent/readdir64.c
===================================================================
--- trunk/uClibc/libc/misc/dirent/readdir64.c 2005-12-15 20:05:52 UTC (rev 12905)
+++ trunk/uClibc/libc/misc/dirent/readdir64.c 2005-12-16 00:10:58 UTC (rev 12906)
@@ -1,5 +1,5 @@
#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
@@ -20,7 +20,6 @@
#include <dirent.h>
#include "dirstream.h"
-#undef readdir64
struct dirent64 attribute_hidden *__readdir64(DIR * dir)
{
ssize_t bytes;
@@ -62,5 +61,3 @@
return de;
}
strong_alias(__readdir64,readdir64)
-
-#endif /* __UCLIBC_HAS_LFS__ */
Modified: trunk/uClibc/libc/misc/dirent/readdir64_r.c
===================================================================
--- trunk/uClibc/libc/misc/dirent/readdir64_r.c 2005-12-15 20:05:52 UTC (rev 12905)
+++ trunk/uClibc/libc/misc/dirent/readdir64_r.c 2005-12-16 00:10:58 UTC (rev 12906)
@@ -1,5 +1,5 @@
#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
@@ -19,7 +19,6 @@
#include <dirent.h>
#include "dirstream.h"
-
int readdir64_r(DIR *dir, struct dirent64 *entry, struct dirent64 **result)
{
int ret;
@@ -69,5 +68,3 @@
__pthread_mutex_unlock(&(dir->dd_lock));
return((de != NULL)? 0 : ret);
}
-#endif /* __UCLIBC_HAS_LFS__ */
-
Modified: trunk/uClibc/libc/misc/dirent/scandir64.c
===================================================================
--- trunk/uClibc/libc/misc/dirent/scandir64.c 2005-12-15 20:05:52 UTC (rev 12905)
+++ trunk/uClibc/libc/misc/dirent/scandir64.c 2005-12-16 00:10:58 UTC (rev 12906)
@@ -25,7 +25,7 @@
#define closedir __closedir
#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
@@ -114,5 +114,3 @@
*namelist = names;
return pos;
}
-#endif /* __UCLIBC_HAS_LFS__ */
-
More information about the uClibc-cvs
mailing list