sal/osl/w32/module.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 7b1bb740a7531ec3c921c4a186a40553756e66cc
Author: Tor Lillqvist <[email protected]>
AuthorDate: Tue May 27 10:48:36 2025 +0300
Commit: Tor Lillqvist <[email protected]>
CommitDate: Sat Jan 17 20:58:40 2026 +0100
Add some DISABLE_DYNLOADING ifdefs to osl/w32, as for unx
Lots of things will have to be tweaked to build core statically for
Windows. This is just one small isolated and fairly obvious trivial
commit. (Assuming that in the disable-dynloading case, for Windows we
want to drop the same dynamic library loading functions in osl as for
Unixish systems.)
Change-Id: Ica0a00d7a3d5b85e5eb933ebd5722824fbf5deeb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197503
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <[email protected]>
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 8286f6a095cb..bf42b5c961d6 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -32,6 +32,8 @@
#include <systools/win32/extended_max_path.hxx>
#include <vector>
+#ifndef DISABLE_DYNLOADING
+
/*
under WIN32, we use the void* oslModule
as a WIN32 HANDLE (which is also a 32-bit value)
@@ -104,6 +106,8 @@ oslModule osl_loadModuleRelativeAscii(
return osl_loadModuleRelative(baseModule,
OUString::createFromAscii(relativePath).pData, mode);
}
+#endif // !DISABLE_DYNLOADING
+
sal_Bool SAL_CALL
osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult)
{