Build fix

refs #10245

diff --git a/lib/base/scriptutils.cpp b/lib/base/scriptutils.cpp
index cd2e1165132c6c1f3a5b1b8f251ea0a42353a13a..837885b8043d4df9f12b8479fdc5c8b3e5053701 100644 (file)
--- a/lib/base/scriptutils.cpp
+++ b/lib/base/scriptutils.cpp
@@ -58,7 +58,10 @@ REGISTER_SCRIPTFUNCTION(get_time, &Utility::GetTime);
 REGISTER_SCRIPTFUNCTION(basename, &Utility::BaseName);
 REGISTER_SCRIPTFUNCTION(dirname, &Utility::DirName);
 REGISTER_SCRIPTFUNCTION(msi_get_component_path, &ScriptUtils::MsiGetComponentPathShim);
+#ifdef _WIN32
 REGISTER_SCRIPTFUNCTION(escape_create_process_arg, &Utility::EscapeCreateProcessArg);
+#endif /* _WIN32 */
+>>>>>>> 08ccb4e... Build fix
 
 String ScriptUtils::CastString(const Value& value)
 {

diff --git a/lib/base/utility.hpp b/lib/base/utility.hpp
index 0cce4c127c7b53d16e82ccbc8426194a8e64f435..d13a5545b78f75ddbd1d9187ff940aa9c80a594b 100644 (file)
--- a/lib/base/utility.hpp
+++ b/lib/base/utility.hpp
@@ -108,7 +108,9 @@ public:
 
        static String EscapeShellCmd(const String& s);
        static String EscapeShellArg(const String& s);
+#ifdef _WIN32
        static String EscapeCreateProcessArg(const String& arg);
+#endif /* _WIN32 */
 
        static String EscapeString(const String& s, const String& chars);
        static String UnescapeString(const String& s);