2bea600f02
...when workdir/UnpackedTarball/lcms2/include/lcms2.h is included from workdir/UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_colorspace.cpp (Library_pdfium). Even with -std=gnu++17, GCC only emits a warning (that is not promoted to an error when building external Library_pdfium) about "register", but at least recent trunk Clang does emit an error by default. (Clang used to have a bug by which it failed to emit any warning/error for uses of "register" on function parameters, but that got recently fixed with <http://llvm.org/viewvc/llvm-project?view=revision&revision=317140> "Fix missing -Wregister warning when 'register' is applied to a function parameter", causing an --enable-werror build failure now when building in C++17 mode with <https://gerrit.libreoffice.org/#/c/43851/> "Build as C++17 when GCC/Clang supports it" locally included.) So instead of trying to further demote any warnings/errors about those uses of "register", just patch them away for good. Change-Id: I7c8757e654d87be710eaaafa871300656d9ee8ff
23 lines
1.1 KiB
Plaintext
23 lines
1.1 KiB
Plaintext
--- include/lcms2.h
|
|
+++ include/lcms2.h
|
|
@@ -1248,13 +1248,13 @@
|
|
CMSAPI void* CMSEXPORT cmsStageData(const cmsStage* mpe);
|
|
|
|
// Sampling
|
|
-typedef cmsInt32Number (* cmsSAMPLER16) (register const cmsUInt16Number In[],
|
|
- register cmsUInt16Number Out[],
|
|
- register void * Cargo);
|
|
+typedef cmsInt32Number (* cmsSAMPLER16) (const cmsUInt16Number In[],
|
|
+ cmsUInt16Number Out[],
|
|
+ void * Cargo);
|
|
|
|
-typedef cmsInt32Number (* cmsSAMPLERFLOAT)(register const cmsFloat32Number In[],
|
|
- register cmsFloat32Number Out[],
|
|
- register void * Cargo);
|
|
+typedef cmsInt32Number (* cmsSAMPLERFLOAT)(const cmsFloat32Number In[],
|
|
+ cmsFloat32Number Out[],
|
|
+ void * Cargo);
|
|
|
|
// Use this flag to prevent changes being written to destination
|
|
#define SAMPLER_INSPECT 0x01000000
|