diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-01-22 23:10:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-01-22 23:10:52 +0000 |
| commit | d1c2a81fbb722355c35766dcde3a5641f5a4afda (patch) | |
| tree | 38c9dd407c8af12092ec84baee70b315d56d8fb9 | |
| parent | e2c8b268cf994af605ef8698fc7a0ce80ee70703 (diff) | |
| parent | ec10b513c283706f984edeec47301b0661f7d283 (diff) | |
| download | e2fsprogs-d1c2a81fbb722355c35766dcde3a5641f5a4afda.tar.gz | |
Merge "Change #define to _BLKID_TYPES_H"
| -rw-r--r-- | lib/blkid/blkid_types.h | 4 | ||||
| -rw-r--r-- | lib/ext2fs/ext2_types.h | 2 | ||||
| -rw-r--r-- | lib/uuid/uuid_types.h | 4 | ||||
| -rw-r--r-- | util/android_types.h | 4 | ||||
| -rwxr-xr-x | util/gen-android-files | 7 |
5 files changed, 14 insertions, 7 deletions
diff --git a/lib/blkid/blkid_types.h b/lib/blkid/blkid_types.h index a8d7cff1..297a69da 100644 --- a/lib/blkid/blkid_types.h +++ b/lib/blkid/blkid_types.h @@ -4,8 +4,8 @@ * also defined the types that we need. */ #if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \ - !defined(_EXT2_TYPES_H)) -#define _EXT2_TYPES_H + !defined(_EXT2_TYPES_H) && !defined(_UUID_TYPES_H)) +#define _BLKID_TYPES_H typedef unsigned char __u8; typedef __signed__ char __s8; diff --git a/lib/ext2fs/ext2_types.h b/lib/ext2fs/ext2_types.h index a8d7cff1..0e5ebe67 100644 --- a/lib/ext2fs/ext2_types.h +++ b/lib/ext2fs/ext2_types.h @@ -4,7 +4,7 @@ * also defined the types that we need. */ #if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \ - !defined(_EXT2_TYPES_H)) + !defined(_EXT2_TYPES_H) && !defined(_UUID_TYPES_H)) #define _EXT2_TYPES_H typedef unsigned char __u8; diff --git a/lib/uuid/uuid_types.h b/lib/uuid/uuid_types.h index a8d7cff1..35e51518 100644 --- a/lib/uuid/uuid_types.h +++ b/lib/uuid/uuid_types.h @@ -4,8 +4,8 @@ * also defined the types that we need. */ #if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \ - !defined(_EXT2_TYPES_H)) -#define _EXT2_TYPES_H + !defined(_EXT2_TYPES_H) && !defined(_UUID_TYPES_H)) +#define _UUID_TYPES_H typedef unsigned char __u8; typedef __signed__ char __s8; diff --git a/util/android_types.h b/util/android_types.h index a8d7cff1..5f05903d 100644 --- a/util/android_types.h +++ b/util/android_types.h @@ -4,8 +4,8 @@ * also defined the types that we need. */ #if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \ - !defined(_EXT2_TYPES_H)) -#define _EXT2_TYPES_H + !defined(_EXT2_TYPES_H) && !defined(_UUID_TYPES_H)) +#define _LINUX_TYPES_H typedef unsigned char __u8; typedef __signed__ char __s8; diff --git a/util/gen-android-files b/util/gen-android-files index 937496bc..cab4e8d4 100755 --- a/util/gen-android-files +++ b/util/gen-android-files @@ -37,9 +37,16 @@ rm -f $MK_CMDS cp lib/blkid/blkid.h.in lib/blkid/blkid.h cp lib/uuid/uuid.h.in lib/uuid/uuid.h + cp util/android_types.h lib/ext2fs/ext2_types.h cp util/android_types.h lib/blkid/blkid_types.h cp util/android_types.h lib/uuid/uuid_types.h +# Copied header files having exactly same content results in debug output +# differences on RBE. Hence modify the #define's appropriately. +sed -i 's/#define _LINUX_TYPES_H/#define _BLKID_TYPES_H/g' lib/blkid/blkid_types.h +sed -i 's/#define _LINUX_TYPES_H/#define _EXT2_TYPES_H/g' lib/ext2fs/ext2_types.h +sed -i 's/#define _LINUX_TYPES_H/#define _UUID_TYPES_H/g' lib/uuid/uuid_types.h + cp util/android_config.h lib/config.h cp misc/e2freefrag.c debugfs/ cp e2fsck/recovery.c e2fsck/revoke.c debugfs/ |