Fix build failure on non-Linux/non-Hurd/non-Masix systems

inode_uid() and inode_gid() weren't getting defined on systems that
were not Linux, Hurd, or Masix.

Addresses-Sourceforge-Bug: #1859778

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h
index 378f059..e124e95 100644 (file)
--- a/lib/ext2fs/ext2_fs.h
+++ b/lib/ext2fs/ext2_fs.h
@@ -427,8 +427,6 @@ struct ext2_inode_large {
 #define i_uid_high     osd2.linux2.l_i_uid_high
 #define i_gid_high     osd2.linux2.l_i_gid_high
 #define i_reserved2    osd2.linux2.l_i_reserved2
-#define inode_uid(inode)       ((inode).i_uid | (inode).i_uid_high << 16)
-#define inode_gid(inode)       ((inode).i_gid | (inode).i_gid_high << 16)
 #else
 #if defined(__GNU__)
 
@@ -438,8 +436,6 @@ struct ext2_inode_large {
 #define i_uid_high     osd2.hurd2.h_i_uid_high
 #define i_gid_high     osd2.hurd2.h_i_gid_high
 #define i_author       osd2.hurd2.h_i_author
-#define inode_uid(inode)       ((inode).i_uid | (inode).i_uid_high << 16)
-#define inode_gid(inode)       ((inode).i_gid | (inode).i_gid_high << 16)
 
 #else
 #if defined(__masix__)
@@ -448,13 +444,19 @@ struct ext2_inode_large {
 #define i_frag         osd2.masix2.m_i_frag
 #define i_fsize                osd2.masix2.m_i_fsize
 #define i_reserved2    osd2.masix2.m_i_reserved2
-#define inode_uid(inode)       ((inode).i_uid)
-#define inode_gid(inode)       ((inode).i_gid)
 
 #endif  /* __masix__ */
 #endif  /* __GNU__ */
 #endif /* defined(__KERNEL__) || defined(__linux__) */
 
+#if defined(__masix__)
+#define inode_uid(inode)       ((inode).i_uid)
+#define inode_gid(inode)       ((inode).i_gid)
+#else
+#define inode_uid(inode)       ((inode).i_uid | (inode).i_uid_high << 16)
+#define inode_gid(inode)       ((inode).i_gid | (inode).i_gid_high << 16)
+#endif
+
 /*
  * File system states
  */