diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2023-12-08 08:30:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2023-12-08 09:49:41 +0100 |
| commit | 13595f6220095d120e13ccb6fbfac1de4c803fe7 (patch) | |
| tree | 37f0863365bdd78a5451f85e29b1fbbf74214d28 /onlineupdate/StaticLibrary_libmar.mk | |
| parent | c0e438eaceb47932e61b9223e048e4eda3ed7636 (diff) | |
Fix --enable-online-update-mar on Windows
The code had apparently rotten a bit,
* a wchar_t vs. char16_t confusion in desktop/source/app/updater.cxx
* code broken by 926e4e469d0285ee72f8da80f00370b4b3120417 "Rename online updater
functions and strcmp relpath" in
onlineupdate/source/update/updater/updater.cxx
* -DUNICODE missing in some places (so that plain Windows functions resolve to
the ...W variant), which had been set centrally in the past IIRC
* silencing some warnings like "C4267: 'initializing': conversion from 'size_t'
to 'int', possible loss of data" (where silencing is the right thing to do for
effectively extern code); no sure why those apparently didn't hit in the past,
maybe it is all warnings that compilers only started to emit in recent years,
or only for recent -std:c++... modes
* silencing some "Conversion from string literal loses const qualifier" errors
with -Zc:strictStrings-; these hit at least with recent VS 2022 Preview and
--with-latest-c++, where -Zc:strictStrings is apparently now on by default
Change-Id: I7fe46f5aa2b42fc9c03f24f7f0236512b4d3b936
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160451
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Diffstat (limited to 'onlineupdate/StaticLibrary_libmar.mk')
| -rw-r--r-- | onlineupdate/StaticLibrary_libmar.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/onlineupdate/StaticLibrary_libmar.mk b/onlineupdate/StaticLibrary_libmar.mk index 9b82e726a21d..37303d71e3b0 100644 --- a/onlineupdate/StaticLibrary_libmar.mk +++ b/onlineupdate/StaticLibrary_libmar.mk @@ -24,4 +24,6 @@ $(eval $(call gb_StaticLibrary_use_static_libraries,\ libmarverify \ )) +$(eval $(call gb_StaticLibrary_set_warnings_not_errors,libmar)) + # vim:set shiftwidth=4 tabstop=4 noexpandtab: */ |