summaryrefslogtreecommitdiff
path: root/ext4_utils/make_ext4fs.c
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2016-02-03 02:31:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-02-03 02:31:25 +0000
commitef77d0d17fb483f0d2ddec466c6c212d773999df (patch)
treea164816be7dcdd5b2989cf8703e68fac6f824735 /ext4_utils/make_ext4fs.c
parentf93e1344fc2cf8a424f31d9134684915926e8931 (diff)
parent1b0f797a7274737468be7259ed9fde448b54af14 (diff)
downloadextras-ef77d0d17fb483f0d2ddec466c6c212d773999df.tar.gz
Merge "Fix warnings in system/extras." am: 4eb09a62f2
am: 1b0f797a72 * commit '1b0f797a7274737468be7259ed9fde448b54af14': Fix warnings in system/extras.
Diffstat (limited to 'ext4_utils/make_ext4fs.c')
-rw-r--r--ext4_utils/make_ext4fs.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
index a9549a5f..913a40df 100644
--- a/ext4_utils/make_ext4fs.c
+++ b/ext4_utils/make_ext4fs.c
@@ -41,6 +41,19 @@
/* These match the Linux definitions of these flags.
L_xx is defined to avoid conflicting with the win32 versions.
*/
+#undef S_IRWXU
+#undef S_IRGRP
+#undef S_IWGRP
+#undef S_IXGRP
+#undef S_IRWXG
+#undef S_IROTH
+#undef S_IWOTH
+#undef S_IXOTH
+#undef S_IRWXO
+#undef S_ISUID
+#undef S_ISGID
+#undef S_ISVTX
+
#define L_S_IRUSR 00400
#define L_S_IWUSR 00200
#define L_S_IXUSR 00100