undef-external-macro.patch 693 B

1234567891011121314151617181920
  1. --- contrib/libs/protobuf/src/google/protobuf/port_def.inc (61c97633ad4150fc3855f71a23e0b8d90f4c4f42)
  2. +++ contrib/libs/protobuf/src/google/protobuf/port_def.inc (305db98d5191470c880de9745e55b395d24b997b)
  3. @@ -383,6 +383,17 @@ static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and
  4. #endif
  5. # define PROTOBUF_DEPRECATED_ENUM
  6. +// External libs can define New macro, but absl will broke...
  7. +#ifdef New
  8. +#undef New
  9. +#endif
  10. +#ifdef Poison
  11. +#undef Poison
  12. +#endif
  13. +#ifdef rename
  14. +#undef rename
  15. +#endif
  16. +
  17. #if defined(__clang__)
  18. #define PROTOBUF_IGNORE_DEPRECATION_START \
  19. _Pragma("clang diagnostic push") \