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/inst_msu/inst_msu.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/inst_msu/inst_msu.cxx')
| -rw-r--r-- | setup_native/source/win32/customactions/inst_msu/inst_msu.cxx | 6 |
1 files changed, 3 insertions, 3 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 fee4e6feb58b..91464fdd17de 100644 --- a/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx +++ b/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx @@ -326,7 +326,7 @@ private: // "InstMSUBinary" property and unpacks the binary with that name to a temporary file; sets // "cleanup_msu" and "inst_msu" properties to the full name of the extracted temporary file. These // properties will become "CustomActionData" property inside relevant deferred actions. -extern "C" UINT __stdcall UnpackMSUForInstall(MSIHANDLE hInstall) +extern "C" __declspec(dllexport) UINT __stdcall UnpackMSUForInstall(MSIHANDLE hInstall) { try { @@ -411,7 +411,7 @@ extern "C" UINT __stdcall UnpackMSUForInstall(MSIHANDLE hInstall) // Deferred action "inst_msu" that must be run from system account. Receives the tempfile name from // "CustomActionData" property, and runs wusa.exe to install it. Waits for it and checks exit code. -extern "C" UINT __stdcall InstallMSU(MSIHANDLE hInstall) +extern "C" __declspec(dllexport) UINT __stdcall InstallMSU(MSIHANDLE hInstall) { try { @@ -486,7 +486,7 @@ extern "C" UINT __stdcall InstallMSU(MSIHANDLE hInstall) // Rollback deferred action "cleanup_msu" that is executed on error or cancel. // It removes the temporary file created by UnpackMSUForInstall action. // MUST be placed IMMEDIATELY AFTER "unpack_msu" in execute sequence. -extern "C" UINT __stdcall CleanupMSU(MSIHANDLE hInstall) +extern "C" __declspec(dllexport) UINT __stdcall CleanupMSU(MSIHANDLE hInstall) { try { |