Alexandre Julliard : lcms2: Revert some calling convention changes.
Alexandre Julliard
julliard at winehq.org
Mon Mar 7 16:04:58 CST 2022
Module: wine
Branch: master
Commit: 4c9d8e194c796102cd34ee72f0eeb2c8b096f80b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c9d8e194c796102cd34ee72f0eeb2c8b096f80b
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Mar 7 20:41:33 2022 +0100
lcms2: Revert some calling convention changes.
We require -mabi=ms now.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/lcms2/include/lcms2.h | 2 +-
libs/lcms2/include/lcms2_plugin.h | 4 ++--
libs/lcms2/src/cmserr.c | 2 +-
libs/lcms2/src/cmslut.c | 2 +-
libs/lcms2/src/cmsplugin.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libs/lcms2/include/lcms2.h b/libs/lcms2/include/lcms2.h
index 8f4d16164a1..c04b73efcd4 100644
--- a/libs/lcms2/include/lcms2.h
+++ b/libs/lcms2/include/lcms2.h
@@ -1234,7 +1234,7 @@ CMSAPI void CMSEXPORT cmsPipelineUnlinkStage(cmsPipeline* lut, cmsS
// then a list of expected types followed with a list of double pointers to Stage elements. If
// the function founds a match with current pipeline, it fills the pointers and returns TRUE
// if not, returns FALSE without touching anything.
-CMSAPI cmsBool WINAPIV cmsPipelineCheckAndRetreiveStages(const cmsPipeline* Lut, cmsUInt32Number n, ...);
+CMSAPI cmsBool CMSEXPORT cmsPipelineCheckAndRetreiveStages(const cmsPipeline* Lut, cmsUInt32Number n, ...);
// Matrix has double precision and CLUT has only float precision. That is because an ICC profile can encode
// matrices with far more precision that CLUTS
diff --git a/libs/lcms2/include/lcms2_plugin.h b/libs/lcms2/include/lcms2_plugin.h
index a0211ff5fd6..5bc8227e388 100644
--- a/libs/lcms2/include/lcms2_plugin.h
+++ b/libs/lcms2/include/lcms2_plugin.h
@@ -102,7 +102,7 @@ CMSAPI void CMSEXPORT cmsMD5finish(cmsProfileID* ProfileID, cmsHAN
// Error logging -------------------------------------------------------------------------------------
-CMSAPI void WINAPIV cmsSignalError(cmsContext ContextID, cmsUInt32Number ErrorCode, const char *ErrorText, ...);
+CMSAPI void CMSEXPORT cmsSignalError(cmsContext ContextID, cmsUInt32Number ErrorCode, const char *ErrorText, ...);
// Memory management ----------------------------------------------------------------------------------
@@ -174,7 +174,7 @@ CMSAPI cmsBool CMSEXPORT _cmsReadAlignment(cmsIOHANDLER* io);
CMSAPI cmsBool CMSEXPORT _cmsWriteAlignment(cmsIOHANDLER* io);
// To deal with text streams. 2K at most
-CMSAPI cmsBool WINAPIV _cmsIOPrintf(cmsIOHANDLER* io, const char* frm, ...);
+CMSAPI cmsBool CMSEXPORT _cmsIOPrintf(cmsIOHANDLER* io, const char* frm, ...);
// Fixed point helper functions
CMSAPI cmsFloat64Number CMSEXPORT _cms8Fixed8toDouble(cmsUInt16Number fixed8);
diff --git a/libs/lcms2/src/cmserr.c b/libs/lcms2/src/cmserr.c
index ee76b431732..f0acb256a96 100644
--- a/libs/lcms2/src/cmserr.c
+++ b/libs/lcms2/src/cmserr.c
@@ -506,7 +506,7 @@ void CMSEXPORT cmsSetLogErrorHandler(cmsLogErrorHandlerFunction Fn)
// Log an error
// ErrorText is a text holding an english description of error.
-void WINAPIV cmsSignalError(cmsContext ContextID, cmsUInt32Number ErrorCode, const char *ErrorText, ...)
+void CMSEXPORT cmsSignalError(cmsContext ContextID, cmsUInt32Number ErrorCode, const char *ErrorText, ...)
{
va_list args;
char Buffer[MAX_ERROR_MESSAGE_LEN];
diff --git a/libs/lcms2/src/cmslut.c b/libs/lcms2/src/cmslut.c
index dd95062afec..1ac5b4d173a 100644
--- a/libs/lcms2/src/cmslut.c
+++ b/libs/lcms2/src/cmslut.c
@@ -107,7 +107,7 @@ void From16ToFloat(const cmsUInt16Number In[], cmsFloat32Number Out[], cmsUInt32
// the function founds a match with current pipeline, it fills the pointers and returns TRUE
// if not, returns FALSE without touching anything. Setting pointers to NULL does bypass
// the storage process.
-cmsBool WINAPIV cmsPipelineCheckAndRetreiveStages(const cmsPipeline* Lut, cmsUInt32Number n, ...)
+cmsBool CMSEXPORT cmsPipelineCheckAndRetreiveStages(const cmsPipeline* Lut, cmsUInt32Number n, ...)
{
va_list args;
cmsUInt32Number i;
diff --git a/libs/lcms2/src/cmsplugin.c b/libs/lcms2/src/cmsplugin.c
index 3265fbc3b8d..2b86b649202 100644
--- a/libs/lcms2/src/cmsplugin.c
+++ b/libs/lcms2/src/cmsplugin.c
@@ -492,7 +492,7 @@ cmsBool CMSEXPORT _cmsWriteAlignment(cmsIOHANDLER* io)
// To deal with text streams. 2K at most
-cmsBool WINAPIV _cmsIOPrintf(cmsIOHANDLER* io, const char* frm, ...)
+cmsBool CMSEXPORT _cmsIOPrintf(cmsIOHANDLER* io, const char* frm, ...)
{
va_list args;
int len;
More information about the wine-cvs
mailing list