diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-09-18 17:25:55 +0200 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-09-18 23:18:01 +0200 |
commit | 28b4f4aeaf160c7721dfecf5bd2445d7dbc6f01c (patch) | |
tree | c281b491f1792d1a509294904911811324093e41 /setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx | |
parent | b9a2d00c7c38ccd24b0663a2ecc6c08106fe51f1 (diff) |
Get rid of Windows .def files in setup_native, use __declspec(dllexport)
For one, replacing the dated .def files with equivalent functionality should be
a good move all by itself. And for another, it paves the way for using
loplugin:external with clang-cl on Windows, which uses the heuristic of not
warning about functions that are explicitly marked as __declspec(dllexport).
Change-Id: I6efd50a8c5ce2a166ca0dd4e5f472118f3f9a071
Reviewed-on: https://gerrit.libreoffice.org/60691
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx')
-rw-r--r-- | setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx index 7534c4cfc50e..6e95c6e1e69b 100644 --- a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx +++ b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx @@ -25,7 +25,7 @@ Called during installation to customize the start menu folder icon. See: http://msdn.microsoft.com/library/en-us/shellcc/platform/shell/programmersguide/shell_basics/shell_basics_extending/custom.asp */ -extern "C" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle ) +extern "C" __declspec(dllexport) UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle ) { std::wstring sOfficeMenuFolder = GetMsiPropertyW( handle, L"OfficeMenuFolder" ); std::wstring sDesktopFile = sOfficeMenuFolder + L"Desktop.ini"; @@ -47,7 +47,7 @@ extern "C" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle ) return ERROR_SUCCESS; } -extern "C" UINT __stdcall DeinstallStartmenuFolderIcon(MSIHANDLE handle) +extern "C" __declspec(dllexport) UINT __stdcall DeinstallStartmenuFolderIcon(MSIHANDLE handle) { std::wstring sOfficeMenuFolder = GetMsiPropertyW( handle, L"OfficeMenuFolder" ); std::wstring sDesktopFile = sOfficeMenuFolder + L"Desktop.ini"; |