Undef DELETE macro on Windows (#8497)

pull/8503/head
Yuriy Chernyshov 4 years ago committed by GitHub
parent 568fd626f9
commit 2714bf0f5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/google/protobuf/port_def.inc
  2. 1
      src/google/protobuf/port_undef.inc

@ -436,6 +436,8 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma push_macro("CREATE_NEW") #pragma push_macro("CREATE_NEW")
#undef CREATE_NEW #undef CREATE_NEW
#pragma push_macro("DELETE")
#undef DELETE
#pragma push_macro("DOUBLE_CLICK") #pragma push_macro("DOUBLE_CLICK")
#undef DOUBLE_CLICK #undef DOUBLE_CLICK
#pragma push_macro("ERROR") #pragma push_macro("ERROR")

@ -86,6 +86,7 @@
// Restore macro that may have been #undef'd in port_def.inc. // Restore macro that may have been #undef'd in port_def.inc.
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma pop_macro("CREATE_NEW") #pragma pop_macro("CREATE_NEW")
#pragma pop_macro("DELETE")
#pragma pop_macro("DOUBLE_CLICK") #pragma pop_macro("DOUBLE_CLICK")
#pragma pop_macro("ERROR") #pragma pop_macro("ERROR")
#pragma pop_macro("ERROR_BUSY") #pragma pop_macro("ERROR_BUSY")

Loading…
Cancel
Save