From dfd54ff53f7b89cee4584953c04c6395abb4f221 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Wed, 11 Oct 2017 16:30:37 +0300 Subject: [PATCH] _MSC_VER >= 1900 build --- DesktopEditor/cximage/raw/dcr.c | 2 ++ DesktopEditor/cximage/raw/dcraw.c | 2 ++ DesktopEditor/cximage/raw/libdcr.c | 2 ++ DesktopEditor/raster/JBig2/source/LeptonLib/environ.h | 2 +- DesktopEditor/xml/build/qt/config.h | 2 ++ DesktopEditor/xml/build/vs2013/config.h | 2 ++ DesktopEditor/xml/libxml2/win32/wince/wincecompat.h | 2 ++ 7 files changed, 13 insertions(+), 1 deletion(-) diff --git a/DesktopEditor/cximage/raw/dcr.c b/DesktopEditor/cximage/raw/dcr.c index 8788a5d808..5a03c0d9a6 100644 --- a/DesktopEditor/cximage/raw/dcr.c +++ b/DesktopEditor/cximage/raw/dcr.c @@ -63,7 +63,9 @@ #include #include #pragma comment(lib, "ws2_32.lib") +#if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf +#endif #define strcasecmp _stricmp #define strncasecmp _strnicmp typedef __int64 INT64; diff --git a/DesktopEditor/cximage/raw/dcraw.c b/DesktopEditor/cximage/raw/dcraw.c index 89dbe838de..7320352737 100644 --- a/DesktopEditor/cximage/raw/dcraw.c +++ b/DesktopEditor/cximage/raw/dcraw.c @@ -68,7 +68,9 @@ #include #include #pragma comment(lib, "ws2_32.lib") +#if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf +#endif #define strcasecmp stricmp #define strncasecmp strnicmp typedef __int64 INT64; diff --git a/DesktopEditor/cximage/raw/libdcr.c b/DesktopEditor/cximage/raw/libdcr.c index 357e99c8b6..e671e47c66 100644 --- a/DesktopEditor/cximage/raw/libdcr.c +++ b/DesktopEditor/cximage/raw/libdcr.c @@ -113,7 +113,9 @@ static dcr_stream_ops dcr_stream_fileops = { #include #include #pragma comment(lib, "ws2_32.lib") +#if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf +#endif #define strcasecmp _stricmp #define strncasecmp _strnicmp typedef __int64 INT64; diff --git a/DesktopEditor/raster/JBig2/source/LeptonLib/environ.h b/DesktopEditor/raster/JBig2/source/LeptonLib/environ.h index 4818785a3e..e7b6d6b5b0 100644 --- a/DesktopEditor/raster/JBig2/source/LeptonLib/environ.h +++ b/DesktopEditor/raster/JBig2/source/LeptonLib/environ.h @@ -269,7 +269,7 @@ enum { /*------------------------------------------------------------------------* * snprintf() renamed in MSVC * *------------------------------------------------------------------------*/ -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf #endif diff --git a/DesktopEditor/xml/build/qt/config.h b/DesktopEditor/xml/build/qt/config.h index b42713517f..73483fbbc5 100644 --- a/DesktopEditor/xml/build/qt/config.h +++ b/DesktopEditor/xml/build/qt/config.h @@ -129,7 +129,9 @@ int isnan (double d) { #if defined(_MSC_VER) #define mkdir(p,m) _mkdir(p) +#if _MSC_VER < 1900 #define snprintf _snprintf +#endif #if _MSC_VER < 1500 #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) #endif diff --git a/DesktopEditor/xml/build/vs2013/config.h b/DesktopEditor/xml/build/vs2013/config.h index 67aa93c84f..f56d185b23 100644 --- a/DesktopEditor/xml/build/vs2013/config.h +++ b/DesktopEditor/xml/build/vs2013/config.h @@ -127,7 +127,9 @@ static int isnan (double d) { #if defined(_MSC_VER) #define mkdir(p,m) _mkdir(p) +#if _MSC_VER < 1900 #define snprintf _snprintf +#endif #if _MSC_VER < 1500 #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) #endif diff --git a/DesktopEditor/xml/libxml2/win32/wince/wincecompat.h b/DesktopEditor/xml/libxml2/win32/wince/wincecompat.h index 5cd19a885e..2d3eec7041 100644 --- a/DesktopEditor/xml/libxml2/win32/wince/wincecompat.h +++ b/DesktopEditor/xml/libxml2/win32/wince/wincecompat.h @@ -43,7 +43,9 @@ char *strerror(int errnum); Macro'ed inexistant funtion names */ +#if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf +#endif #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) #define perror(_t) MessageBox(NULL, _T("_t"), _T("Error/Warning"), MB_OK)