Workaround `ERROR_RETRY` and `ERROR_TIMEOUT` macros on WIN32

PiperOrigin-RevId: 645233944
pull/17187/head
Protobuf Team Bot 5 months ago committed by Copybara-Service
parent c826a69107
commit 7ab844de52
  1. 4
      src/google/protobuf/port_def.inc
  2. 2
      src/google/protobuf/port_undef.inc

@ -749,6 +749,10 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
#undef ERROR_INSTALL_FAILED
#pragma push_macro("ERROR_NOT_FOUND")
#undef ERROR_NOT_FOUND
#pragma push_macro("ERROR_RETRY")
#undef ERROR_RETRY
#pragma push_macro("ERROR_TIMEOUT")
#undef ERROR_TIMEOUT
#pragma push_macro("GetClassName")
#undef GetClassName
#pragma push_macro("GetCurrentTime")

@ -119,6 +119,8 @@
#pragma pop_macro("ERROR_BUSY")
#pragma pop_macro("ERROR_INSTALL_FAILED")
#pragma pop_macro("ERROR_NOT_FOUND")
#pragma pop_macro("ERROR_RETRY")
#pragma pop_macro("ERROR_TIMEOUT")
#pragma pop_macro("GetClassName")
#pragma pop_macro("GetCurrentTime")
#pragma pop_macro("GetMessage")

Loading…
Cancel
Save