1*6777b538SAndroid Build Coastguard Workerdiff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc 2*6777b538SAndroid Build Coastguard Workerindex bdb2eecbe2e47..8bd06d340f7c3 100644 3*6777b538SAndroid Build Coastguard Worker--- a/src/google/protobuf/port_def.inc 4*6777b538SAndroid Build Coastguard Worker+++ b/src/google/protobuf/port_def.inc 5*6777b538SAndroid Build Coastguard Worker@@ -313,7 +313,10 @@ 6*6777b538SAndroid Build Coastguard Worker #if defined(PROTOBUF_DEPRECATED_MSG) 7*6777b538SAndroid Build Coastguard Worker #error PROTOBUF_DEPRECATED_MSG was previously defined 8*6777b538SAndroid Build Coastguard Worker #endif 9*6777b538SAndroid Build Coastguard Worker-#if __has_attribute(deprecated) || PROTOBUF_GNUC_MIN(3, 0) 10*6777b538SAndroid Build Coastguard Worker+#if defined(PROTOBUF_ALLOW_DEPRECATED) 11*6777b538SAndroid Build Coastguard Worker+# define PROTOBUF_DEPRECATED 12*6777b538SAndroid Build Coastguard Worker+# define PROTOBUF_DEPRECATED_MSG(msg) 13*6777b538SAndroid Build Coastguard Worker+#elif __has_attribute(deprecated) || PROTOBUF_GNUC_MIN(3, 0) 14*6777b538SAndroid Build Coastguard Worker # define PROTOBUF_DEPRECATED __attribute__((deprecated)) 15*6777b538SAndroid Build Coastguard Worker # define PROTOBUF_DEPRECATED_MSG(msg) __attribute__((deprecated(msg))) 16*6777b538SAndroid Build Coastguard Worker #elif defined(_MSC_VER) 17*6777b538SAndroid Build Coastguard Worker@@ -327,7 +330,9 @@ 18*6777b538SAndroid Build Coastguard Worker #if defined(PROTOBUF_DEPRECATED_ENUM) 19*6777b538SAndroid Build Coastguard Worker #error PROTOBUF_DEPRECATED_ENUM was previously defined 20*6777b538SAndroid Build Coastguard Worker #endif 21*6777b538SAndroid Build Coastguard Worker-#if defined(__clang__) || PROTOBUF_GNUC_MIN(6, 0) 22*6777b538SAndroid Build Coastguard Worker+#if defined(PROTOBUF_ALLOW_DEPRECATED) 23*6777b538SAndroid Build Coastguard Worker+# define PROTOBUF_DEPRECATED_ENUM 24*6777b538SAndroid Build Coastguard Worker+#elif defined(__clang__) || PROTOBUF_GNUC_MIN(6, 0) 25*6777b538SAndroid Build Coastguard Worker // https://gcc.gnu.org/gcc-6/changes.html 26*6777b538SAndroid Build Coastguard Worker # define PROTOBUF_DEPRECATED_ENUM __attribute__((deprecated)) 27*6777b538SAndroid Build Coastguard Worker #else 28