intermediate changes

ref:e2259743aaaa198850a5184b92813fca8eb3a49b

4 files changed, 13 insertions, 11 deletions

diff --git a/contrib/libs/grpc/include/grpc/impl/codegen/port_platform.h b/contrib/libs/grpc/include/grpc/impl/codegen/port_platform.h
index ce8c896508b..cd0310d88ca 100644
--- a/contrib/libs/grpc/include/grpc/impl/codegen/port_platform.h
+++ b/contrib/libs/grpc/include/grpc/impl/codegen/port_platform.h
@@ -51,7 +51,7 @@
 #define NOMINMAX
 #endif /* NOMINMAX */
 
-#include <util/system/winint.h>
+#include <windows.h>
 
 #ifndef _WIN32_WINNT
 #error \
diff --git a/contrib/libs/grpc/src/compiler/cpp_generator.cc b/contrib/libs/grpc/src/compiler/cpp_generator.cc
index b63ee5c876c..c093085b4a5 100644
--- a/contrib/libs/grpc/src/compiler/cpp_generator.cc
+++ b/contrib/libs/grpc/src/compiler/cpp_generator.cc
@@ -169,6 +169,9 @@ TString GetHeaderIncludes(grpc_generator::File* file,
     std::vector<TString> headers(headers_strs, array_end(headers_strs));
     PrintIncludes(printer.get(), headers, params.use_system_headers,
                   params.grpc_search_path);
+    // port_def.inc must be included after all other includes.
+    std::vector<TString> wrapHeadersTop = {"google/protobuf/port_def.inc"};
+    PrintIncludes(printer.get(), wrapHeadersTop, params.use_system_headers, "");
     printer->Print(vars, "\n");
 
     vars["message_header_ext"] = params.message_header_extension.empty()
@@ -1778,7 +1781,7 @@ TString GetHeaderServices(grpc_generator::File* file,
 }
 
 TString GetHeaderEpilogue(grpc_generator::File* file,
-                              const Parameters& /*params*/) {
+                              const Parameters& params) {
   TString output;
   {
     // Scope the output stream so it closes and finalizes output to the string.
@@ -1799,6 +1802,8 @@ TString GetHeaderEpilogue(grpc_generator::File* file,
     }
 
     printer->Print(vars, "\n");
+    std::vector<TString> wrapHeadersBottom = {"google/protobuf/port_undef.inc"};
+    PrintIncludes(printer.get(), wrapHeadersBottom, params.use_system_headers, "");
     printer->Print(vars, "#endif  // GRPC_$filename_identifier$__INCLUDED\n");
 
     printer->Print(file->GetTrailingComments("//").c_str());
@@ -1858,6 +1863,9 @@ TString GetSourceIncludes(grpc_generator::File* file,
     std::vector<TString> headers(headers_strs, array_end(headers_strs));
     PrintIncludes(printer.get(), headers, params.use_system_headers,
                   params.grpc_search_path);
+    // port_def.inc must be included after all other includes.
+    std::vector<TString> wrapHeadersTop = {"google/protobuf/port_def.inc"};
+    PrintIncludes(printer.get(), wrapHeadersTop, params.use_system_headers, "");
 
     if (!file->package().empty()) {
       std::vector<TString> parts = file->package_parts();
@@ -2315,7 +2323,7 @@ TString GetSourceServices(grpc_generator::File* file,
 }
 
 TString GetSourceEpilogue(grpc_generator::File* file,
-                              const Parameters& /*params*/) {
+                              const Parameters& params) {
   TString temp;
 
   if (!file->package().empty()) {
@@ -2328,6 +2336,8 @@ TString GetSourceEpilogue(grpc_generator::File* file,
     }
     temp.append("\n");
   }
+  std::vector<TString> wrapHeadersBottom = {"google/protobuf/port_undef.inc"};
+  PrintIncludes(file->CreatePrinter(&temp).get(), wrapHeadersBottom, params.use_system_headers, "");
 
   return temp;
 }
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/sockaddr_windows.h b/contrib/libs/grpc/src/core/lib/iomgr/sockaddr_windows.h
index 9faebbc254f..4d637251a18 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/sockaddr_windows.h
+++ b/contrib/libs/grpc/src/core/lib/iomgr/sockaddr_windows.h
@@ -25,16 +25,12 @@
 
 #ifdef GRPC_WINSOCK_SOCKET
 
-#define OPTIONAL
-
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
 // must be included after the above
 #include <mswsock.h>
 
-#undef OPTIONAL
-
 typedef struct sockaddr grpc_sockaddr;
 typedef struct sockaddr_in grpc_sockaddr_in;
 typedef struct in_addr grpc_in_addr;
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/socket_windows.cc b/contrib/libs/grpc/src/core/lib/iomgr/socket_windows.cc
index f117653c490..d29de40d0b4 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/socket_windows.cc
+++ b/contrib/libs/grpc/src/core/lib/iomgr/socket_windows.cc
@@ -22,15 +22,11 @@
 
 #ifdef GRPC_WINSOCK_SOCKET
 
-#define OPTIONAL
-
 #include <winsock2.h>
 
 // must be included after winsock2.h
 #include <mswsock.h>
 
-#undef OPTIONAL
-
 #include "y_absl/strings/str_format.h"
 
 #include <grpc/support/alloc.h>