From 857146f2320327e2f710be17b475809367bd76b0 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Tue, 26 Feb 2002 15:24:39 +0000
Subject: Don't redefine stuff

---
 libc/misc/dirent/alphasort64.c | 13 ++++++++++---
 libc/misc/dirent/readdir64.c   | 13 ++++++++++---
 libc/misc/dirent/scandir64.c   | 13 ++++++++++---
 3 files changed, 30 insertions(+), 9 deletions(-)

(limited to 'libc/misc/dirent')

diff --git a/libc/misc/dirent/alphasort64.c b/libc/misc/dirent/alphasort64.c
index bddf65ea7..9607929bb 100644
--- a/libc/misc/dirent/alphasort64.c
+++ b/libc/misc/dirent/alphasort64.c
@@ -1,8 +1,15 @@
 #include <features.h>
 #ifdef __UCLIBC_HAVE_LFS__
-#define _FILE_OFFSET_BITS   64
-#define __USE_LARGEFILE64
-#define __USE_FILE_OFFSET64
+#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 
+#undef _FILE_OFFSET_BITS
+#define	_FILE_OFFSET_BITS   64
+#endif
+#ifndef __USE_FILE_OFFSET64
+# define __USE_FILE_OFFSET64	1
+#endif
+#ifndef __USE_LARGEFILE64
+# define __USE_LARGEFILE64	1
+#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 c8f3b8d46..b11ce83d2 100644
--- a/libc/misc/dirent/readdir64.c
+++ b/libc/misc/dirent/readdir64.c
@@ -1,8 +1,15 @@
 #include <features.h>
 #ifdef __UCLIBC_HAVE_LFS__
-#define _FILE_OFFSET_BITS   64
-#define __USE_LARGEFILE64
-#define __USE_FILE_OFFSET64
+#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 
+#undef _FILE_OFFSET_BITS
+#define	_FILE_OFFSET_BITS   64
+#endif
+#ifndef __USE_FILE_OFFSET64
+# define __USE_FILE_OFFSET64	1
+#endif
+#ifndef __USE_LARGEFILE64
+# define __USE_LARGEFILE64	1
+#endif
 #include <dirent.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/libc/misc/dirent/scandir64.c b/libc/misc/dirent/scandir64.c
index 12752db72..321ff253c 100644
--- a/libc/misc/dirent/scandir64.c
+++ b/libc/misc/dirent/scandir64.c
@@ -25,9 +25,16 @@
 
 #include <features.h>
 #ifdef __UCLIBC_HAVE_LFS__
-#define _FILE_OFFSET_BITS   64
-#define __USE_LARGEFILE64
-#define __USE_FILE_OFFSET64
+#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 
+#undef _FILE_OFFSET_BITS
+#define	_FILE_OFFSET_BITS   64
+#endif
+#ifndef __USE_FILE_OFFSET64
+# define __USE_FILE_OFFSET64	1
+#endif
+#ifndef __USE_LARGEFILE64
+# define __USE_LARGEFILE64	1
+#endif
 #include <dirent.h>
 #include <stdio.h>
 #include <string.h>
-- 
cgit v1.2.3