commit 1f1a51aecd7c825418bfedcb66772e92de790149
author Elliott Hughes <enh@google.com> Thu Mar 31 17:05:30 2016 -0700
committer Elliott Hughes <enh@google.com> Thu Mar 31 17:05:30 2016 -0700
tree 542594ba6d7ac07a0af0229bcd473d8a325dc699
parent eaf50be332f015bd90e45d4f9d111b24cd230f00

Add a few missing types and constants to headers.

This (and other stuff still to come) prevented xfstests from building out
of the box.

Bug: http://b/27952303
Change-Id: Id38fd37386d43fc351c56dca18785a465e3e6145

libc/include/mntent.h

diff --git a/libc/include/mntent.h b/libc/include/mntent.h
index a190aeb..dbade0c 100644
--- a/libc/include/mntent.h
+++ b/libc/include/mntent.h
@@ -25,6 +25,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
 #ifndef _MNTENT_H_
 #define _MNTENT_H_
 
@@ -33,7 +34,16 @@
 #include <paths.h>  /* for _PATH_MOUNTED */
 
 #define MOUNTED _PATH_MOUNTED
+
+#define MNTTYPE_DEFAULTS "defaults"
 #define MNTTYPE_IGNORE "ignore"
+#define MNTTYPE_NFS "nfs"
+#define MNTTYPE_NOAUTO "noauto"
+#define MNTTYPE_NOSUID "nosuid"
+#define MNTTYPE_RO "ro"
+#define MNTTYPE_RW "rw"
+#define MNTTYPE_SUID "suid"
+#define MNTTYPE_SWAP "swap"
 
 struct mntent {
   char* mnt_fsname;

libc/include/sys/param.h

diff --git a/libc/include/sys/param.h b/libc/include/sys/param.h
index e64d6ce..5d2248f 100644
--- a/libc/include/sys/param.h
+++ b/libc/include/sys/param.h
@@ -31,6 +31,8 @@
 #include <limits.h>
 #include <linux/param.h>
 
+#define DEV_BSIZE 512
+
 #define MAXPATHLEN  PATH_MAX
 #define MAXSYMLINKS 8
 

libc/include/sys/stat.h

diff --git a/libc/include/sys/stat.h b/libc/include/sys/stat.h
index 257ded0..86668f6 100644
--- a/libc/include/sys/stat.h
+++ b/libc/include/sys/stat.h
@@ -135,6 +135,12 @@
 #define DEFFILEMODE (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) /* 0666 */
 #endif
 
+#if defined(__USE_BSD) || defined(__USE_GNU)
+#define S_IREAD S_IRUSR
+#define S_IWRITE S_IWUSR
+#define S_IEXEC S_IXUSR
+#endif
+
 extern int chmod(const char*, mode_t);
 extern int fchmod(int, mode_t);
 extern int mkdir(const char*, mode_t);

libc/include/sys/types.h

diff --git a/libc/include/sys/types.h b/libc/include/sys/types.h
index 217fd60..a422261 100644
--- a/libc/include/sys/types.h
+++ b/libc/include/sys/types.h
@@ -66,6 +66,8 @@
 typedef __kernel_ino_t __ino_t;
 typedef __ino_t ino_t;
 
+typedef uint64_t ino64_t;
+
 typedef uint32_t __nlink_t;
 typedef __nlink_t nlink_t;