From b46e384ca7d0a7fd0e34ecfa972a8e8bb3abdd02 Mon Sep 17 00:00:00 2001 From: Valentina Zhuravska Date: Sat, 10 Oct 2015 04:49:10 +0300 Subject: [PATCH] Fixed warnings in Windows --HG-- branch : develop --- src/libs/vdxf/dxflib/dl_codes.h | 4 +++- src/libs/vdxf/dxflib/dl_dxf.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libs/vdxf/dxflib/dl_codes.h b/src/libs/vdxf/dxflib/dl_codes.h index 2336b3685..1c567b051 100644 --- a/src/libs/vdxf/dxflib/dl_codes.h +++ b/src/libs/vdxf/dxflib/dl_codes.h @@ -42,7 +42,7 @@ #define strcasecmp(s,t) stricmp(s,t) #endif -#if defined(_WIN32) +#if defined(_WIN32)&&!defined(strcasecmp) #define strcasecmp(s,t) _stricmp(s,t) #endif @@ -50,7 +50,9 @@ #ifdef _WIN32 #undef M_PI #define M_PI 3.14159265358979323846 +#if defined(Q_CC_MSVC) #pragma warning(disable : 4800) +#endif // Q_CC_MSVC #endif #ifndef M_PI diff --git a/src/libs/vdxf/dxflib/dl_dxf.h b/src/libs/vdxf/dxflib/dl_dxf.h index 1cb77c5ea..7d36df357 100644 --- a/src/libs/vdxf/dxflib/dl_dxf.h +++ b/src/libs/vdxf/dxflib/dl_dxf.h @@ -41,7 +41,9 @@ #ifdef _WIN32 #undef M_PI #define M_PI 3.14159265358979323846 +#if defined(Q_CC_MSVC) #pragma warning(disable : 4800) +#endif // Q_CC_MSVC #endif #ifndef M_PI