Commit 91d13963 authored by Alexandre Julliard's avatar Alexandre Julliard

tiff: Revert some calling convention changes.

We require -mabi=ms now. Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 4c9d8e19
......@@ -340,7 +340,7 @@ TIFFVGetFieldDefaulted(TIFF* tif, uint32_t tag, va_list ap)
* Like TIFFGetField, but return any default
* value if the tag is not present in the directory.
*/
int WINAPIV
int
TIFFGetFieldDefaulted(TIFF* tif, uint32_t tag, ...)
{
int ok;
......
......@@ -824,7 +824,7 @@ OkToChangeTag(TIFF* tif, uint32_t tag)
* when/if the directory structure is
* updated.
*/
int WINAPIV
int
TIFFSetField(TIFF* tif, uint32_t tag, ...)
{
va_list ap;
......@@ -1266,7 +1266,7 @@ _TIFFVGetField(TIFF* tif, uint32_t tag, va_list ap)
* Return the value of a field in the
* internal directory structure.
*/
int WINAPIV
int
TIFFGetField(TIFF* tif, uint32_t tag, ...)
{
int status;
......
......@@ -436,7 +436,7 @@ _TIFFSetupFields(TIFF* tif, const TIFFFieldArray* fieldarray)
}
}
static int __cdecl
static int
tagCompare(const void* a, const void* b)
{
const TIFFField* ta = *(const TIFFField**) a;
......
......@@ -45,7 +45,7 @@ TIFFSetErrorHandlerExt(TIFFErrorHandlerExt handler)
return (prev);
}
void WINAPIV
void
TIFFError(const char* module, const char* fmt, ...)
{
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, ...)
{
va_list ap;
......
......@@ -45,7 +45,7 @@ TIFFSetWarningHandlerExt(TIFFErrorHandlerExt handler)
return (prev);
}
void WINAPIV
void
TIFFWarning(const char* module, const char* fmt, ...)
{
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, ...)
{
va_list ap;
......
......@@ -347,9 +347,9 @@ extern void TIFFCleanup(TIFF* tif);
extern void TIFFClose(TIFF* tif);
extern int TIFFFlush(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 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 TIFFReadDirectory(TIFF* tif);
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 TIFFSetSubDirectory(TIFF*, uint64_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 TIFFUnsetField(TIFF*, uint32_t);
extern int TIFFWriteDirectory(TIFF *);
......@@ -456,10 +456,10 @@ extern TIFF* TIFFClientOpen(const char*, const char*,
TIFFMapFileProc, TIFFUnmapFileProc);
extern const char* TIFFFileName(TIFF*);
extern const char* TIFFSetFileName(TIFF*, const char *);
extern void WINAPIV 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 WINAPIV 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 TIFFError(const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,2,3)));
extern void TIFFErrorExt(thandle_t, const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,3,4)));
extern void TIFFWarning(const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,2,3)));
extern void TIFFWarningExt(thandle_t, const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,3,4)));
extern TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler);
extern TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt);
extern TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment