From d3ea4bfbc8459ec4ef601dffe78b295d1e0b4544 Mon Sep 17 00:00:00 2001 From: ACGNnsj Date: Tue, 14 Feb 2023 16:19:58 +0800 Subject: [PATCH] Remove Duplicated Preprocessor Macro Definition (#19376) * Update openrct2.common.props Remove duplicated preprocessor macro definition of _USE_MATH_DEFINES which defined in src/openrct2/common.h and SDL2/SDL_stdinc.h * Remove the definition of _USE_MATH_DEFINES from 'common.h' --- openrct2.common.props | 2 +- src/openrct2/common.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/openrct2.common.props b/openrct2.common.props index 6afb7deebf..5312baada1 100644 --- a/openrct2.common.props +++ b/openrct2.common.props @@ -54,7 +54,7 @@ C4549: 'operator': operator before comma has no effect; did you intend 'operator'? C4555: expression has no effect; expected expression with side-effect --> - OPENGL_NO_LINK;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) + OPENGL_NO_LINK;_CRT_SECURE_NO_WARNINGS;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) __AVX2__;__SSE4_1__;%(PreprocessorDefinitions) ENABLE_SCRIPTING;%(PreprocessorDefinitions) MultiThreaded diff --git a/src/openrct2/common.h b/src/openrct2/common.h index f8046d768f..28be492ad9 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -9,9 +9,6 @@ #pragma once -#ifndef _USE_MATH_DEFINES -# define _USE_MATH_DEFINES -#endif #undef M_PI #ifdef _MSC_VER