From 282b9288ab3763813c7bda953a1af9ee1d3b83e3 Mon Sep 17 00:00:00 2001 From: Michal Maciola Date: Wed, 17 Nov 2021 12:00:38 +0100 Subject: [PATCH] all: fix compilation errors on non-windows clang Thorvg couldn't be compiled on macos as non-portable microsoft calls used. Changed definitions checking to Visual Studio only. --- src/lib/tvgCommon.h | 2 +- src/savers/tvg/tvgTvgSaver.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/tvgCommon.h b/src/lib/tvgCommon.h index 259492ba..b1c58618 100644 --- a/src/lib/tvgCommon.h +++ b/src/lib/tvgCommon.h @@ -48,7 +48,7 @@ using namespace tvg; #define TVG_FALLTHROUGH #endif -#if defined(__clang__) && !defined(__EMSCRIPTEN__) +#if defined(_MSC_VER) && defined(__clang__) #define strncpy strncpy_s #define strdup _strdup #endif diff --git a/src/savers/tvg/tvgTvgSaver.cpp b/src/savers/tvg/tvgTvgSaver.cpp index 46ad28e2..9450d80e 100644 --- a/src/savers/tvg/tvgTvgSaver.cpp +++ b/src/savers/tvg/tvgTvgSaver.cpp @@ -32,7 +32,7 @@ static FILE* _fopen(const char* filename, const char* mode) { -#if defined(__clang__) && !defined(__EMSCRIPTEN__) +#if defined(_MSC_VER) && defined(__clang__) FILE *fp; auto err = fopen_s(&fp, filename, mode); if (err != 0) return nullptr;