e154d9044f
Dropped patches: - lcms2-msvc-disable-sse2.patch.1: applied to the VS2010 solution; so actually long unused by LO. - 0017-Upgrade-Visual-studio-2017-15.8.patch.1: not used anymore, because the Windows build now uses the VS2019 solution. The new external/lcms2/c++17.patch.1 explicitly disables the register keywordin the header. Change-Id: Icc6dd2a41d0fc94f00fc1ac7fa5bebc941c2a791 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98734 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
13 lines
401 B
Groff
13 lines
401 B
Groff
diff --git a/include/lcms2.h b/include/lcms2.h
|
|
index cf52014..926e2a0 100644
|
|
--- a/include/lcms2.h
|
|
+++ b/include/lcms2.h
|
|
@@ -62,7 +62,7 @@
|
|
// #define CMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT
|
|
|
|
// Uncomment this to remove the "register" storage class
|
|
-// #define CMS_NO_REGISTER_KEYWORD 1
|
|
+#define CMS_NO_REGISTER_KEYWORD 1
|
|
|
|
// ********** End of configuration toggles ******************************
|
|
|