From 4b1f1a878732b920f94f3e42d0cb328c308d4bca Mon Sep 17 00:00:00 2001
From: peizhilin <wopeizl@163.com>
Date: Fri, 9 Nov 2018 14:21:34 +0800
Subject: [PATCH] fix merge issue

---
 paddle/fluid/inference/analysis/helper.h | 1 +
 paddle/fluid/platform/init.cc            | 2 ++
 paddle/fluid/platform/port.h             | 3 +--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/paddle/fluid/inference/analysis/helper.h b/paddle/fluid/inference/analysis/helper.h
index 5151e2b69a..ea568a581d 100644
--- a/paddle/fluid/inference/analysis/helper.h
+++ b/paddle/fluid/inference/analysis/helper.h
@@ -26,6 +26,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/framework/variable.h"
 #include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/port.h"
 
 namespace paddle {
 namespace inference {
diff --git a/paddle/fluid/platform/init.cc b/paddle/fluid/platform/init.cc
index 4910baec6a..092585ed2a 100644
--- a/paddle/fluid/platform/init.cc
+++ b/paddle/fluid/platform/init.cc
@@ -175,7 +175,9 @@ void InitGLOG(const std::string &prog_name) {
   // glog will not hold the ARGV[0] inside.
   // Use strdup to alloc a new string.
   google::InitGoogleLogging(strdup(prog_name.c_str()));
+#ifndef _WIN32
   google::InstallFailureSignalHandler();
+#endif
 }
 
 }  // namespace framework
diff --git a/paddle/fluid/platform/port.h b/paddle/fluid/platform/port.h
index cf9f4aa95b..4ff07edc19 100644
--- a/paddle/fluid/platform/port.h
+++ b/paddle/fluid/platform/port.h
@@ -30,11 +30,10 @@
 #include <sys/stat.h>
 #include <algorithm>  // std::accumulate
 #else
+#include <stdio.h>
 #include <io.h>  // _popen, _pclose
 #include <windows.h>
-#if defined(_WIN32)
 #include <numeric>  // std::accumulate in msvc
-#endif
 // windows version of __attribute__((unused))
 #define UNUSED __pragma(warning(suppress : 4100))
 
-- 
GitLab