diff options
Diffstat (limited to 'setup_native')
3 files changed, 7 insertions, 7 deletions
diff --git a/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx b/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx index 26f7668ff069..5dc47993a132 100644 --- a/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx +++ b/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx @@ -112,7 +112,7 @@ void WriteLogElem(MSIHANDLE hInst, MSIHANDLE hRec, std::ostringstream& sTmpl, UI WriteLogElem(hInst, hRec, sTmpl, nField, elem.c_str(), others...); } -static std::string sLogPrefix; +std::string sLogPrefix; template <class... StrType> void WriteLog(MSIHANDLE hInst, const StrType&... elements) { diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx index 1a2e82eb7c54..70ba1cc5246c 100644 --- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx +++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx @@ -62,11 +62,11 @@ static const WCHAR* g_Extensions[] = nullptr }; -static const int WORD_START = 0; -static const int EXCEL_START = 9; -static const int POWERPOINT_START = 20; -static const int VISIO_START = 30; -static const int VISIO_END = 32; +const int WORD_START = 0; +const int EXCEL_START = 9; +const int POWERPOINT_START = 20; +const int VISIO_START = 30; +const int VISIO_END = 32; // ".xlam", // Office Excel 2007 XML macro-enabled add-in // ".ppam", // Office PowerPoint 2007 macro-enabled XML add-in diff --git a/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx b/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx index c7b1cc742938..e7e7013f3471 100644 --- a/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx +++ b/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx @@ -111,7 +111,7 @@ void WriteLogElem(MSIHANDLE hInst, MSIHANDLE hRec, std::ostringstream& sTmpl, UI WriteLogElem(hInst, hRec, sTmpl, nField, elem.c_str(), others...); } -static std::string sLogPrefix; +std::string sLogPrefix; template <class... StrType> void WriteLog(MSIHANDLE hInst, const StrType&... elements) { |