Fix __fxstat which is called from fstat. Remove obsolete fstat64.

include/features.h

Index: include/features.h
diff --git a/include/features.h b/include/features.h
index 3a44e38a2c2e650afb22605615789a51537173bc..3f7be8407b8ed8e200c2ba4af6e2e9a1456a1dea 100644
--- a/include/features.h
+++ b/include/features.h
@@ -113,6 +113,17 @@
 #undef	__FAVOR_BSD
 #undef	__KERNEL_STRICT_NAMES
 

[eaeltsin, 2011/01/13 10:43:45]

Please add a comment on what you are doing here.

What about USE_FILE_OFFSET64?
Also see comment in io/sys/stat.h

[halyavin, 2011/01/13 11:15:21]

Done.

+#ifdef __native_client__
+# ifndef _LIBC
+#  ifndef _FILE_OFFSET_BITS
+#    define _FILE_OFFSET_BITS 64
+#  endif
+#  if _FILE_OFFSET_BITS != 64

[eaeltsin, 2011/01/13 10:43:45]

elif instead endif+if?

[halyavin, 2011/01/13 11:15:21]

Done.

+#   error "native client requires _FILE_OFFSET_BITS being equal to 64"

[eaeltsin, 2011/01/13 10:43:45]

_FILE_OFFSET_BITS == 64

[halyavin, 2011/01/13 11:15:21]

Done.

+#  endif
+# endif
+#endif
+
 /* Suppress kernel-name space pollution unless user expressedly asks
    for it.  */
 #ifndef _LOOSE_KERNEL_NAMES
@@ -157,7 +168,7 @@
 # define _XOPEN_SOURCE	600
 # undef  _XOPEN_SOURCE_EXTENDED
 # define _XOPEN_SOURCE_EXTENDED	1
-# undef	 _LARGEFILE64_SOURCE
+# undef  _LARGEFILE64_SOURCE

[eaeltsin, 2011/01/13 10:43:45]

Please avoid spacing only changes.

[halyavin, 2011/01/13 11:15:21]

Done.

 # define _LARGEFILE64_SOURCE	1
 # undef  _BSD_SOURCE
 # define _BSD_SOURCE	1
@@ -250,7 +261,11 @@
 #endif
 
 #ifdef _LARGEFILE64_SOURCE
-# define __USE_LARGEFILE64	1
+/* native client applications shouldn't use functions with 64 suffix
+ unfortunately we can't make glibc itself live without them */

[eaeltsin, 2011/01/13 10:43:45]

Please align this comment, add punctuation and capitalize it properly.

[halyavin, 2011/01/13 11:15:21]

Done.

+# if !defined __native_client__ || defined _LIBC
+#  define __USE_LARGEFILE64	1
+# endif
 #endif
 
 #if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64