Don't redefine stuff

libc/misc/dirent/alphasort64.c

@@ -1,8 +1,15 @@
 #include <features.h>
 #ifdef __UCLIBC_HAVE_LFS__
-#define _FILE_OFFSET_BITS   64
+#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 
-#define __USE_LARGEFILE64
+#undef _FILE_OFFSET_BITS
-#define __USE_FILE_OFFSET64
+#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"

libc/misc/dirent/readdir64.c

@@ -1,8 +1,15 @@
 #include <features.h>
 #ifdef __UCLIBC_HAVE_LFS__
-#define _FILE_OFFSET_BITS   64
+#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 
-#define __USE_LARGEFILE64
+#undef _FILE_OFFSET_BITS
-#define __USE_FILE_OFFSET64
+#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>

libc/misc/dirent/scandir64.c

@@ -25,9 +25,16 @@
 
 #include <features.h>
 #ifdef __UCLIBC_HAVE_LFS__
-#define _FILE_OFFSET_BITS   64
+#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 
-#define __USE_LARGEFILE64
+#undef _FILE_OFFSET_BITS
-#define __USE_FILE_OFFSET64
+#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>

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