system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-04 20:17:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

tiff: Revert some calling convention changes.

Browse source 
We require -mabi=ms now.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2022-03-07 20:41:41 +01:00
parent 4c9d8e194c
commit 91d13963f8
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/tiff/libtiff/tif_aux.c
View file

@ -340,7 +340,7 @@ TIFFVGetFieldDefaulted(TIFF* tif, uint32_t tag, va_list ap)
* Like TIFFGetField, but return any default * Like TIFFGetField, but return any default
* value if the tag is not present in the directory. * value if the tag is not present in the directory.
*/ */
int WINAPIV int
TIFFGetFieldDefaulted(TIFF* tif, uint32_t tag, ...) TIFFGetFieldDefaulted(TIFF* tif, uint32_t tag, ...)
{ {
int ok; int ok;

4
libs/tiff/libtiff/tif_dir.c
View file

@ -824,7 +824,7 @@ OkToChangeTag(TIFF* tif, uint32_t tag)
* when/if the directory structure is * when/if the directory structure is
* updated. * updated.
*/ */
int WINAPIV int
TIFFSetField(TIFF* tif, uint32_t tag, ...) TIFFSetField(TIFF* tif, uint32_t tag, ...)
{ {
va_list ap; va_list ap;
@ -1266,7 +1266,7 @@ _TIFFVGetField(TIFF* tif, uint32_t tag, va_list ap)
* Return the value of a field in the * Return the value of a field in the
* internal directory structure. * internal directory structure.
*/ */
int WINAPIV int
TIFFGetField(TIFF* tif, uint32_t tag, ...) TIFFGetField(TIFF* tif, uint32_t tag, ...)
{ {
int status; int status;

2
libs/tiff/libtiff/tif_dirinfo.c
View file

@ -436,7 +436,7 @@ _TIFFSetupFields(TIFF* tif, const TIFFFieldArray* fieldarray)
} }
} }
static int __cdecl static int
tagCompare(const void* a, const void* b) tagCompare(const void* a, const void* b)
{ {
const TIFFField* ta = *(const TIFFField**) a; const TIFFField* ta = *(const TIFFField**) a;

4
libs/tiff/libtiff/tif_error.c
View file

@ -45,7 +45,7 @@ TIFFSetErrorHandlerExt(TIFFErrorHandlerExt handler)
return (prev); return (prev);
} }
void WINAPIV void
TIFFError(const char* module, const char* fmt, ...) TIFFError(const char* module, const char* fmt, ...)
{ {
va_list ap; va_list ap;
@ -61,7 +61,7 @@ TIFFError(const char* module, const char* fmt, ...)
} }
} }
void WINAPIV void
TIFFErrorExt(thandle_t fd, const char* module, const char* fmt, ...) TIFFErrorExt(thandle_t fd, const char* module, const char* fmt, ...)
{ {
va_list ap; va_list ap;

4
libs/tiff/libtiff/tif_warning.c
View file

@ -45,7 +45,7 @@ TIFFSetWarningHandlerExt(TIFFErrorHandlerExt handler)
return (prev); return (prev);
} }
void WINAPIV void
TIFFWarning(const char* module, const char* fmt, ...) TIFFWarning(const char* module, const char* fmt, ...)
{ {
va_list ap; va_list ap;
@ -61,7 +61,7 @@ TIFFWarning(const char* module, const char* fmt, ...)
} }
} }
void WINAPIV void
TIFFWarningExt(thandle_t fd, const char* module, const char* fmt, ...) TIFFWarningExt(thandle_t fd, const char* module, const char* fmt, ...)
{ {
va_list ap; va_list ap;

14
libs/tiff/libtiff/tiffio.h
View file

@ -347,9 +347,9 @@ extern void TIFFCleanup(TIFF* tif);
extern void TIFFClose(TIFF* tif); extern void TIFFClose(TIFF* tif);
extern int TIFFFlush(TIFF* tif); extern int TIFFFlush(TIFF* tif);
extern int TIFFFlushData(TIFF* tif); extern int TIFFFlushData(TIFF* tif);
extern int WINAPIV TIFFGetField(TIFF* tif, uint32_t tag, ...); extern int TIFFGetField(TIFF* tif, uint32_t tag, ...);
extern int TIFFVGetField(TIFF* tif, uint32_t tag, va_list ap); extern int TIFFVGetField(TIFF* tif, uint32_t tag, va_list ap);
extern int WINAPIV TIFFGetFieldDefaulted(TIFF* tif, uint32_t tag, ...); extern int TIFFGetFieldDefaulted(TIFF* tif, uint32_t tag, ...);
extern int TIFFVGetFieldDefaulted(TIFF* tif, uint32_t tag, va_list ap); extern int TIFFVGetFieldDefaulted(TIFF* tif, uint32_t tag, va_list ap);
extern int TIFFReadDirectory(TIFF* tif); extern int TIFFReadDirectory(TIFF* tif);
extern int TIFFReadCustomDirectory(TIFF* tif, toff_t diroff, const TIFFFieldArray* infoarray); extern int TIFFReadCustomDirectory(TIFF* tif, toff_t diroff, const TIFFFieldArray* infoarray);
@ -410,7 +410,7 @@ extern int TIFFLastDirectory(TIFF*);
extern int TIFFSetDirectory(TIFF*, uint16_t); extern int TIFFSetDirectory(TIFF*, uint16_t);
extern int TIFFSetSubDirectory(TIFF*, uint64_t); extern int TIFFSetSubDirectory(TIFF*, uint64_t);
extern int TIFFUnlinkDirectory(TIFF*, uint16_t); extern int TIFFUnlinkDirectory(TIFF*, uint16_t);
extern int WINAPIV TIFFSetField(TIFF*, uint32_t, ...); extern int TIFFSetField(TIFF*, uint32_t, ...);
extern int TIFFVSetField(TIFF*, uint32_t, va_list); extern int TIFFVSetField(TIFF*, uint32_t, va_list);
extern int TIFFUnsetField(TIFF*, uint32_t); extern int TIFFUnsetField(TIFF*, uint32_t);
extern int TIFFWriteDirectory(TIFF *); extern int TIFFWriteDirectory(TIFF *);
@ -456,10 +456,10 @@ extern TIFF* TIFFClientOpen(const char*, const char*,
TIFFMapFileProc, TIFFUnmapFileProc); TIFFMapFileProc, TIFFUnmapFileProc);
extern const char* TIFFFileName(TIFF*); extern const char* TIFFFileName(TIFF*);
extern const char* TIFFSetFileName(TIFF*, const char *); extern const char* TIFFSetFileName(TIFF*, const char *);
extern void WINAPIV TIFFError(const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,2,3))); extern void TIFFError(const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,2,3)));
extern void WINAPIV TIFFErrorExt(thandle_t, const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,3,4))); extern void TIFFErrorExt(thandle_t, const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,3,4)));
extern void WINAPIV TIFFWarning(const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,2,3))); extern void TIFFWarning(const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,2,3)));
extern void WINAPIV TIFFWarningExt(thandle_t, const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,3,4))); extern void TIFFWarningExt(thandle_t, const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,3,4)));
extern TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler); extern TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler);
extern TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt); extern TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt);
extern TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler); extern TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler);