diff options
Diffstat (limited to 'setup_native/source/win32')
6 files changed, 7 insertions, 7 deletions
diff --git a/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx b/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx index 9581ce32f008..7b0f9a5bd18d 100644 --- a/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx +++ b/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx @@ -86,7 +86,7 @@ std::wstring GetQuickstarterLinkNameW(MSIHANDLE handle) return quickstarterlinkname; } -static inline bool IsValidHandle( HANDLE handle ) +static bool IsValidHandle( HANDLE handle ) { return nullptr != handle && INVALID_HANDLE_VALUE != handle; } diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx index f8be58bcdcda..b1ffb6976c87 100644 --- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx +++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx @@ -84,7 +84,7 @@ inline void OutputDebugStringFormatW( LPCWSTR pFormat, ... ) va_end(args); } #else -static inline void OutputDebugStringFormatW( LPCWSTR, ... ) +static void OutputDebugStringFormatW( LPCWSTR, ... ) { } #endif diff --git a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx index 836b3e655e75..0a879dc1b80e 100644 --- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx +++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx @@ -33,7 +33,7 @@ inline void OutputDebugStringFormatW( PCWSTR pFormat, ... ) va_end(args); } #else -static inline void OutputDebugStringFormatW( PCWSTR, ... ) +static void OutputDebugStringFormatW( PCWSTR, ... ) { } #endif diff --git a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx index 3b5262ca9826..494cfaedad91 100644 --- a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx +++ b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx @@ -93,12 +93,12 @@ namespace return convertedGuid; } - inline bool IsSetMsiPropertyW(MSIHANDLE handle, const std::wstring& sProperty) + bool IsSetMsiPropertyW(MSIHANDLE handle, const std::wstring& sProperty) { return (GetMsiPropertyW(handle, sProperty).length() > 0); } - inline void SetMsiPropertyW(MSIHANDLE handle, const std::wstring& sProperty) + void SetMsiPropertyW(MSIHANDLE handle, const std::wstring& sProperty) { MsiSetPropertyW(handle, sProperty.c_str(), L"1"); } diff --git a/setup_native/source/win32/customactions/tools/checkversion.cxx b/setup_native/source/win32/customactions/tools/checkversion.cxx index 80e56be0cdb1..ffb7a8aa4216 100644 --- a/setup_native/source/win32/customactions/tools/checkversion.cxx +++ b/setup_native/source/win32/customactions/tools/checkversion.cxx @@ -60,7 +60,7 @@ inline void OutputDebugStringFormatW( PCWSTR pFormat, ... ) va_end(args); } #else -static inline void OutputDebugStringFormatW( PCWSTR, ... ) +static void OutputDebugStringFormatW( PCWSTR, ... ) { } #endif diff --git a/setup_native/source/win32/customactions/tools/seterror.cxx b/setup_native/source/win32/customactions/tools/seterror.cxx index e0c4389fd1a7..f1800ffb7ffb 100644 --- a/setup_native/source/win32/customactions/tools/seterror.cxx +++ b/setup_native/source/win32/customactions/tools/seterror.cxx @@ -40,7 +40,7 @@ inline void OutputDebugStringFormatW( PCWSTR pFormat, ... ) va_end(args); } #else -static inline void OutputDebugStringFormatW( PCWSTR, ... ) +static void OutputDebugStringFormatW( PCWSTR, ... ) { } #endif |