Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 10:28:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Require C11, switch to standard static_assert

Browse Source
This commit is contained in:
Mike Gelfand
2020-08-18 13:35:29 +03:00
parent 5125feca5d
commit 077f4d8d2b
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -383,14 +383,14 @@ endif()
## Compiler standard version ## Compiler standard version
if(CMAKE_VERSION VERSION_LESS "3.1") if(CMAKE_VERSION VERSION_LESS "3.1")
if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")
elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC") elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17")
endif() endif()
else() else()
set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD 11)
set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_C_STANDARD_REQUIRED ON)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)

9
libtransmission/tr-macros.h
View File

@@ -139,15 +139,12 @@
* @def TR_STATIC_ASSERT * @def TR_STATIC_ASSERT
* @brief This helper allows to perform static checks at compile time * @brief This helper allows to perform static checks at compile time
*/ */
#if defined(static_assert) #if defined(__cplusplus) || defined(static_assert)
#define TR_STATIC_ASSERT static_assert #define TR_STATIC_ASSERT static_assert
#elif __has_feature(c_static_assert) || __has_extension(c_static_assert) #elif __has_feature(c_static_assert) || __has_extension(c_static_assert) || TR_GNUC_CHECK_VERSION(4, 6)
#define TR_STATIC_ASSERT _Static_assert #define TR_STATIC_ASSERT _Static_assert
#else #else
#define TR_STATIC_ASSERT(x, msg) \ #define TR_STATIC_ASSERT(x, msg) (void)(x)
{ \
typedef char __tr_static_check__ [(x) ? 1 : -1] UNUSED; \
}
#endif #endif
/* Sometimes the system defines MAX/MIN, sometimes not. /* Sometimes the system defines MAX/MIN, sometimes not.