summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-02-26 15:24:39 +0000
committerEric Andersen <andersen@codepoet.org>2002-02-26 15:24:39 +0000
commit857146f2320327e2f710be17b475809367bd76b0 (patch)
tree2eea6dd233c1a3ef6ad6884ef41bc0d5b7931129
parentefdb21fff439759a746f339e30aba255ed4a60d5 (diff)
Don't redefine stuff
-rw-r--r--libc/misc/dirent/alphasort64.c13
-rw-r--r--libc/misc/dirent/readdir64.c13
-rw-r--r--libc/misc/dirent/scandir64.c13
-rw-r--r--libc/misc/insremque/insremque.c2
4 files changed, 31 insertions, 10 deletions
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>
diff --git a/libc/misc/insremque/insremque.c b/libc/misc/insremque/insremque.c
index 8cdf09b23..7f156c601 100644
--- a/libc/misc/insremque/insremque.c
+++ b/libc/misc/insremque/insremque.c
@@ -17,7 +17,7 @@
Boston, MA 02111-1307, USA. */
#include <features.h>
-#define _GNU_SOURCE
+#define __USE_GNU
#include <stddef.h>
#ifndef _SVID_SOURCE
#define _SVID_SOURCE 1