Revert "unify googletest and googlemock main functions"

This reverts commit a909becdc599c46bcb57346b6123cb57cd07d15d.

2 files changed, 4 insertions, 9 deletions

diff --git a/googlemock/src/gmock_main.cc b/googlemock/src/gmock_main.cc
index d9e71700..89c81831 100644
--- a/googlemock/src/gmock_main.cc
+++ b/googlemock/src/gmock_main.cc
@@ -55,7 +55,7 @@ GTEST_API_ int _tmain(int argc, TCHAR** argv) {
 #else
 GTEST_API_ int main(int argc, char** argv) {
 #endif  // __MSC_VER
-  std::cout << "Running main() from " << __FILE__ << '\n';
+  std::cout << "Running main() from gmock_main.cc\n";
   // Since Google Mock depends on Google Test, InitGoogleMock() is
   // also responsible for initializing Google Test.  Therefore there's
   // no need for calling testing::InitGoogleTest() separately.
diff --git a/googletest/src/gtest_main.cc b/googletest/src/gtest_main.cc
index 63b2cfd1..46b27c3d 100644
--- a/googletest/src/gtest_main.cc
+++ b/googletest/src/gtest_main.cc
@@ -27,7 +27,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <iostream>
+#include <cstdio>
 #include "gtest/gtest.h"
 
 #if GTEST_OS_ESP8266 || GTEST_OS_ESP32
@@ -45,14 +45,9 @@ void loop() { RUN_ALL_TESTS(); }
 #endif
 
 #else
-#if __MSC_VER
-# include <tchar.h>  // NOLINT
 
-GTEST_API_ int _tmain(int argc, TCHAR** argv) {
-#else
-GTEST_API_ int main(int argc, char** argv) {
-#endif  // __MSC_VER
-  std::cout << "Running main() from " << __FILE__ << '\n';
+GTEST_API_ int main(int argc, char **argv) {
+  printf("Running main() from %s\n", __FILE__);
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }