Browse Source

Fix redefinition problem

Eric Andersen 23 years ago
parent
commit
cb6028dcf8
4 changed files with 40 additions and 12 deletions
  1. 10 3
      libc/misc/statfs/fstatfs64.c
  2. 10 3
      libc/misc/statfs/fstatvfs.c
  3. 10 3
      libc/misc/statfs/statfs64.c
  4. 10 3
      libc/misc/statfs/statvfs.c

+ 10 - 3
libc/misc/statfs/fstatfs64.c

@@ -21,9 +21,16 @@
 
 #ifdef __UCLIBC_HAVE_LFS__
 
-#define _FILE_OFFSET_BITS   64
-#define __USE_FILE_OFFSET64
-#define __USE_LARGEFILE64
+#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 <errno.h>
 #include <string.h>

+ 10 - 3
libc/misc/statfs/fstatvfs.c

@@ -20,9 +20,16 @@
 #include <features.h>
 
 #ifdef __UCLIBC_HAVE_LFS__
-# define _FILE_OFFSET_BITS   64
-# define __USE_FILE_OFFSET64
-# define __USE_LARGEFILE64
+#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
 #endif
 
 #define __USE_GNU

+ 10 - 3
libc/misc/statfs/statfs64.c

@@ -21,9 +21,16 @@
 
 #ifdef __UCLIBC_HAVE_LFS__
 
-#define _FILE_OFFSET_BITS   64
-#define __USE_FILE_OFFSET64
-#define __USE_LARGEFILE64
+#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 <errno.h>
 #include <string.h>

+ 10 - 3
libc/misc/statfs/statvfs.c

@@ -20,9 +20,16 @@
 #include <features.h>
 
 #ifdef __UCLIBC_HAVE_LFS__
-# define _FILE_OFFSET_BITS   64
-# define __USE_FILE_OFFSET64
-# define __USE_LARGEFILE64
+#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
 #endif
 
 #define __USE_GNU