From 660ba9e990bec0c402dc877d3f418a2bdf193253 Mon Sep 17 00:00:00 2001
From: Jozef Izso <jozef.izso@gmail.com>
Date: Mon, 4 Mar 2019 19:58:59 +0100
Subject: [grpc] update patch file to apply cleanly for grpc 1.18.0 (#5519)

---
 ports/grpc/fix-uwp.patch | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ports/grpc/fix-uwp.patch b/ports/grpc/fix-uwp.patch
index 81b79d1e0..1811fdf92 100644
--- a/ports/grpc/fix-uwp.patch
+++ b/ports/grpc/fix-uwp.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b39e6f8..5d35293 100644
+index e1013dc561..b02d07ccba 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -90,6 +90,9 @@ if(UNIX)
@@ -50,7 +50,7 @@ index b39e6f8..5d35293 100644
  if (gRPC_BUILD_TESTS)
  add_custom_target(buildtests_c)
  add_dependencies(buildtests_c algorithm_test)
-@@ -3805,7 +3818,6 @@ foreach(_hdr
+@@ -3795,7 +3808,6 @@ foreach(_hdr
      DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}"
    )
  endforeach()
@@ -58,7 +58,7 @@ index b39e6f8..5d35293 100644
  
  
  if (gRPC_INSTALL)
-@@ -3815,6 +3827,7 @@ if (gRPC_INSTALL)
+@@ -3805,6 +3817,7 @@ if (gRPC_INSTALL)
      ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
    )
  endif()
@@ -66,7 +66,7 @@ index b39e6f8..5d35293 100644
  
  if (gRPC_BUILD_TESTS)
  
-@@ -3935,7 +3948,7 @@ foreach(_hdr
+@@ -3925,7 +3938,7 @@ foreach(_hdr
      DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}"
    )
  endforeach()
@@ -75,7 +75,7 @@ index b39e6f8..5d35293 100644
  
  
  if (gRPC_INSTALL)
-@@ -3945,6 +3958,7 @@ if (gRPC_INSTALL)
+@@ -3935,6 +3948,7 @@ if (gRPC_INSTALL)
      ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
    )
  endif()
@@ -83,7 +83,7 @@ index b39e6f8..5d35293 100644
  
  if (gRPC_BUILD_TESTS)
  
-@@ -4916,7 +4930,6 @@ foreach(_hdr
+@@ -4926,7 +4940,6 @@ foreach(_hdr
      DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}"
    )
  endforeach()
@@ -91,7 +91,7 @@ index b39e6f8..5d35293 100644
  
  
  if (gRPC_INSTALL)
-@@ -4926,6 +4939,7 @@ if (gRPC_INSTALL)
+@@ -4936,6 +4949,7 @@ if (gRPC_INSTALL)
      ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
    )
  endif()
@@ -100,10 +100,10 @@ index b39e6f8..5d35293 100644
  if (gRPC_BUILD_TESTS)
  
 diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc
-index 7e4b3c9..da67bde 100644
+index 61c366098e..aac2ce0a9f 100644
 --- a/src/core/lib/iomgr/resource_quota.cc
 +++ b/src/core/lib/iomgr/resource_quota.cc
-@@ -936,7 +936,7 @@ void grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size,
+@@ -937,7 +937,7 @@ void grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size,
  void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size) {
    gpr_mu_lock(&resource_user->mu);
    grpc_resource_quota* resource_quota = resource_user->resource_quota;
-- 
cgit v1.2.3