trying to fix compilation. Does it work now for everybody?

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2043

diff --git a/coregrind/vg_unsafe.h b/coregrind/vg_unsafe.h
index 5ce8bd0cb636aa93b5dae77a6e2b0be9b8a07a22..64d16300323a552b9255f776bc124cb004edfd19 100644 (file)
--- a/coregrind/vg_unsafe.h
+++ b/coregrind/vg_unsafe.h
@@ -90,9 +90,6 @@
 /* 2.0 at least, for gid_t and loff_t */
 #include <sys/types.h>
 
-#include <asm/statfs.h>
-#undef statfs
-
 #include <sys/sysinfo.h>
 
 #include <sys/poll.h>

diff --git a/include/vg_kerneliface.h b/include/vg_kerneliface.h
index 0be5f2bddfc24afcd7dd135e3bfd71139a227114..55d66b396b43cb3202da8198b6df04b5f8c81425 100644 (file)
--- a/include/vg_kerneliface.h
+++ b/include/vg_kerneliface.h
@@ -671,8 +671,41 @@ struct vki_sockaddr {
   char            sa_data[14];   /* Address data. */
 };
 
+/* statfs structs */
+/*
+ * bits/statfs.h
+ */
+
+struct statfs {
+        unsigned int f_type;
+        unsigned int f_bsize;
+        unsigned int f_blocks;
+        unsigned int f_bfree;
+        unsigned int f_bavail;
+        unsigned int f_files;
+        unsigned int f_ffree;
+        int f_fsid[ 2 ];
+        unsigned int f_namelen;
+        unsigned int f_frsize;
+        unsigned int f_spare[5];
+};
+
+struct statfs64 {
+        unsigned int f_type;
+        unsigned int f_bsize;
+        unsigned long long f_blocks;
+        unsigned long long f_bfree;
+        unsigned long long f_bavail;
+        unsigned long long f_files;
+        unsigned long long f_ffree;
+        int f_fsid[ 2 ];
+        unsigned int f_namelen;
+        unsigned int f_frsize;
+        unsigned int f_spare[5];
+};
+
 
-#endif /* ndef __VG_KERNELIFACE_H */
+#endif /*  __VG_KERNELIFACE_H */
 
 /*--------------------------------------------------------------------*/
 /*--- end                                         vg_kerneliface.h ---*/