From bafa644c182e0d9ed1c21d97b16305a07633ec2d Mon Sep 17 00:00:00 2001
From: Krystian Kuzniarek <krystian.kuzniarek@gmail.com>
Date: Tue, 10 Sep 2019 14:14:01 +0200
Subject: [PATCH 1/2] remove a dead function

---
 googletest/include/gtest/internal/gtest-port.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index 830aa191..29d9edf4 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -2019,10 +2019,6 @@ inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
 
 GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
 
-inline const char* StrNCpy(char* dest, const char* src, size_t n) {
-  return strncpy(dest, src, n);
-}
-
 // ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and
 // StrError() aren't needed on Windows CE at this time and thus not
 // defined there.

From 0cd3fbc8abe649ac61f76b364a181f047a5e9e31 Mon Sep 17 00:00:00 2001
From: Krystian Kuzniarek <krystian.kuzniarek@gmail.com>
Date: Tue, 10 Sep 2019 14:14:17 +0200
Subject: [PATCH 2/2] change includes in gtest-port.h

---
 googletest/include/gtest/gtest-message.h       | 1 +
 googletest/include/gtest/internal/gtest-port.h | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/googletest/include/gtest/gtest-message.h b/googletest/include/gtest/gtest-message.h
index 4a80e11e..21899232 100644
--- a/googletest/include/gtest/gtest-message.h
+++ b/googletest/include/gtest/gtest-message.h
@@ -49,6 +49,7 @@
 
 #include <limits>
 #include <memory>
+#include <sstream>
 
 #include "gtest/internal/gtest-port.h"
 
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index 29d9edf4..2f351eca 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -248,7 +248,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <memory>
 #include <type_traits>
 
 #ifndef _WIN32_WCE
@@ -261,12 +260,10 @@
 # include <TargetConditionals.h>
 #endif
 
-#include <algorithm>  // NOLINT
 #include <iostream>   // NOLINT
-#include <sstream>    // NOLINT
+#include <memory>
 #include <string>     // NOLINT
 #include <tuple>
-#include <utility>
 #include <vector>  // NOLINT
 
 #include "gtest/internal/gtest-port-arch.h"