From 7e142132bfc400dd4e5eca587ce099debc090a10 Mon Sep 17 00:00:00 2001 From: Recep Aslantas Date: Sun, 17 May 2020 19:24:48 +0300 Subject: [PATCH] win: suppress warning; C4005: '_CRT_SECURE_NO_WARNINGS': macro redefinition --- include/cglm/common.h | 9 +++++++-- test/include/common.h | 9 +++++++-- test/tests.h | 5 +++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/include/cglm/common.h b/include/cglm/common.h index 8596970..0fc35ed 100644 --- a/include/cglm/common.h +++ b/include/cglm/common.h @@ -8,8 +8,13 @@ #ifndef cglm_common_h #define cglm_common_h -#define _USE_MATH_DEFINES /* for windows */ -#define _CRT_SECURE_NO_WARNINGS /* for windows */ +#ifndef _USE_MATH_DEFINES +# define _USE_MATH_DEFINES /* for windows */ +#endif + +#ifndef _CRT_SECURE_NO_WARNINGS +# define _CRT_SECURE_NO_WARNINGS /* for windows */ +#endif #include #include diff --git a/test/include/common.h b/test/include/common.h index c5529e4..eb13bfa 100644 --- a/test/include/common.h +++ b/test/include/common.h @@ -8,8 +8,13 @@ #ifndef tests_common_h #define tests_common_h -#define _USE_MATH_DEFINES /* for windows */ -#define _CRT_SECURE_NO_WARNINGS /* for windows */ +#ifndef _USE_MATH_DEFINES +# define _USE_MATH_DEFINES /* for windows */ +#endif + +#ifndef _CRT_SECURE_NO_WARNINGS +# define _CRT_SECURE_NO_WARNINGS /* for windows */ +#endif #include #include diff --git a/test/tests.h b/test/tests.h index 1ed75d8..7ce7eae 100644 --- a/test/tests.h +++ b/test/tests.h @@ -992,6 +992,7 @@ TEST_LIST { /* bezier */ TEST_ENTRY(bezier) + /* vec2 */ /* Macros */ TEST_ENTRY(MACRO_GLM_VEC2_ONE_INIT) @@ -1070,7 +1071,6 @@ TEST_LIST { TEST_ENTRY(glmc_vec2_lerp) /* vec3 */ - /* Macros */ TEST_ENTRY(MACRO_GLM_VEC3_ONE_INIT) @@ -1236,7 +1236,8 @@ TEST_LIST { TEST_ENTRY(glmc_vec3_sqrt) /* vec4 */ - + /* Macros */ + TEST_ENTRY(MACRO_GLM_VEC4_ONE_INIT) TEST_ENTRY(MACRO_GLM_VEC4_ZERO_INIT) TEST_ENTRY(MACRO_GLM_VEC4_ONE)