From 8ca4b0f257287ff9c5acc875899c0844acdcc876 Mon Sep 17 00:00:00 2001 From: Victor Perevertkin Date: Tue, 26 Oct 2021 22:21:11 +0300 Subject: [PATCH] [CMAKE] Remove __inline substitutions All supported compilers can do C99 now, this is not needed anymore. --- CMakeLists.txt | 4 ---- sdk/cmake/gcc.cmake | 2 -- sdk/cmake/msvc.cmake | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f02a6023eae..899960ab68e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,10 +140,6 @@ if(NOT CMAKE_CROSSCOMPILING) if(MSVC_VERSION GREATER 1699) add_definitions(/D_ALLOW_KEYWORD_MACROS) endif() - if(NOT USE_CLANG_CL) - # FIXME: Inspect - add_definitions(/Dinline=__inline) - endif() endif() add_subdirectory(sdk/include/host) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 65085aba793..921583cb276 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -166,8 +166,6 @@ elseif(ARCH STREQUAL "arm") add_definitions(-D__MSVCRT__) # DUBIOUS endif() -add_definitions(-D_inline=__inline) - # Fix build with GLIBCXX + our c++ headers add_definitions(-D_GLIBCXX_HAVE_BROKEN_VSWPRINTF) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 8377e717739..5645f83dc31 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -30,7 +30,7 @@ if(ARCH STREQUAL "i386") add_definitions(/DWIN32 /D_WINDOWS) endif() -add_definitions(/Dinline=__inline /D__STDC__=1) +add_definitions(/D__STDC__=1) # Ignore any "standard" include paths, and do not use any default CRT library. if(NOT USE_CLANG_CL)