tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fix 

refs #10245
This commit is contained in:
Gunnar Beutner 2015-09-30 11:05:20 +02:00
parent 1a638e35b2
commit 32dcd106fb
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/base/scriptutils.cpp
View File

@ -58,7 +58,10 @@ REGISTER_SCRIPTFUNCTION(get_time, &Utility::GetTime);
REGISTER_SCRIPTFUNCTION(basename, &Utility::BaseName); REGISTER_SCRIPTFUNCTION(basename, &Utility::BaseName);
REGISTER_SCRIPTFUNCTION(dirname, &Utility::DirName); REGISTER_SCRIPTFUNCTION(dirname, &Utility::DirName);
REGISTER_SCRIPTFUNCTION(msi_get_component_path, &ScriptUtils::MsiGetComponentPathShim); REGISTER_SCRIPTFUNCTION(msi_get_component_path, &ScriptUtils::MsiGetComponentPathShim);
#ifdef _WIN32
REGISTER_SCRIPTFUNCTION(escape_create_process_arg, &Utility::EscapeCreateProcessArg); REGISTER_SCRIPTFUNCTION(escape_create_process_arg, &Utility::EscapeCreateProcessArg);
#endif /* _WIN32 */
>>>>>>> 08ccb4e... Build fix
String ScriptUtils::CastString(const Value& value) String ScriptUtils::CastString(const Value& value)
{ {

2
lib/base/utility.hpp
View File

@ -108,7 +108,9 @@ public:
static String EscapeShellCmd(const String& s); static String EscapeShellCmd(const String& s);
static String EscapeShellArg(const String& s); static String EscapeShellArg(const String& s);
#ifdef _WIN32
static String EscapeCreateProcessArg(const String& arg); static String EscapeCreateProcessArg(const String& arg);
#endif /* _WIN32 */
static String EscapeString(const String& s, const String& chars); static String EscapeString(const String& s, const String& chars);
static String UnescapeString(const String& s); static String UnescapeString(const String& s);