fix compilation error on Visual Studio 2013 and earlier

- fix compilation error about "inline"
  - fix linker error about "_TIFF_snprintf_f"
pull/10344/head
Tomoaki Teshima 7 years ago
parent 6cedc82799
commit c057d29192
  1. 5
      3rdparty/libtiff/CMakeLists.txt
  2. 38
      3rdparty/libtiff/snprintf.c

@ -34,9 +34,6 @@ if(NOT MSVC)
check_include_file(unistd.h HAVE_UNISTD_H)
endif()
if(MSVC)
set(INLINE_KEYWORD "inline")
else()
# Inspired from /usr/share/autoconf/autoconf/c.m4
foreach(inline_keyword "inline" "__inline__" "__inline")
if(NOT DEFINED C_INLINE)
@ -59,7 +56,6 @@ else()
if(NOT DEFINED C_INLINE)
set(INLINE_KEYWORD)
endif()
endif()
# Check type sizes
@ -413,6 +409,7 @@ set(lib_srcs
tif_write.c
tif_zip.c
tif_stream.cxx
snprintf.c
t4.h
tif_dir.h
tif_fax3.h

@ -0,0 +1,38 @@
/**
* Workaround for lack of snprintf(3) in Visual Studio. See
* http://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010/8712996#8712996
* It's a trivial wrapper around the builtin _vsnprintf_s and
* _vscprintf functions.
*/
#ifdef _MSC_VER
#include <stdio.h>
#include <stdarg.h>
int _TIFF_vsnprintf_f(char* str, size_t size, const char* format, va_list ap)
{
int count = -1;
if (size != 0)
count = _vsnprintf_s(str, size, _TRUNCATE, format, ap);
if (count == -1)
count = _vscprintf(format, ap);
return count;
}
int _TIFF_snprintf_f(char* str, size_t size, const char* format, ...)
{
int count;
va_list ap;
va_start(ap, format);
count = vsnprintf(str, size, format, ap);
va_end(ap);
return count;
}
#endif // _MSC_VER
Loading…
Cancel
Save