diff options
| author | Allen Winter <allen.winter@kdab.com> | 2022-10-05 10:30:02 -0400 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2022-10-05 10:30:02 -0400 |
| commit | 9a7c90829d39d258022dd599e5feaef5729822d7 (patch) | |
| tree | 3f8854f26b626e5c63f19100b0dbf0d15b274bb8 | |
| parent | 7f5098b903e76333ca9ad21b0510826e7b863d6c (diff) | |
| parent | e38c6c332a956ad8eddc6233bc82c2979c64ac11 (diff) | |
| download | libical-git-9a7c90829d39d258022dd599e5feaef5729822d7.tar.gz | |
Merge branch '3.0' into issue585
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/libical/icalcomponent.c | 3 | ||||
| -rw-r--r-- | src/libical/icalderivedproperty.c.in | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ac0c7f1..01af3490 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -511,6 +511,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang") check_c_compiler_flag(-Wformat-security HAVE_GCC_FORMAT_SECURITY) check_c_compiler_flag(-Wredundant-decls HAVE_GCC_REDUNDANT_DECLS) check_c_compiler_flag(-Wunreachable-code HAVE_GCC_UNREACHABLE_CODE) + check_c_compiler_flag(-Wvarargs HAVE_GCC_VARARGS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -Wno-deprecated -Wall -Wno-unknown-pragmas -Wextra -Winit-self -Wunused -Wno-div-by-zero -Wundef -Wpointer-arith -Wtype-limits -Wwrite-strings -Werror=return-type") if(HAVE_GCC_UNUSED_BUT_SET) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused-but-set-variable") @@ -530,6 +531,9 @@ if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang") if(HAVE_GCC_UNREACHABLE_CODE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunreachable-code") endif() + if(HAVE_GCC_VARARGS) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wvarargs") + endif() if(CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_GNU_SOURCE") endif() @@ -547,6 +551,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") check_cxx_compiler_flag(-Wformat-security HAVE_GXX_FORMAT_SECURITY) check_cxx_compiler_flag(-Wredundant-decls HAVE_GXX_REDUNDANT_DECLS) check_cxx_compiler_flag(-Wunreachable-code HAVE_GXX_UNREACHABLE_CODE) + check_cxx_compiler_flag(-Wvarargs HAVE_GXX_VARARGS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Weffc++ -Wno-deprecated -Wall -Wextra -Woverloaded-virtual -Winit-self -Wunused -Wno-div-by-zero -Wundef -Wpointer-arith -Wtype-limits -Wwrite-strings -Werror=return-type") if(HAVE_GXX_UNUSED_BUT_SET) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-but-set-variable") @@ -569,6 +574,9 @@ if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") if(HAVE_GXX_UNREACHABLE_CODE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunreachable-code") endif() + if(HAVE_GXX_VARARGS) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wvarargs") + endif() if(CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_GNU_SOURCE") endif() diff --git a/src/libical/icalcomponent.c b/src/libical/icalcomponent.c index bc160a04..04f61449 100644 --- a/src/libical/icalcomponent.c +++ b/src/libical/icalcomponent.c @@ -113,8 +113,6 @@ icalcomponent *icalcomponent_new(icalcomponent_kind kind) return icalcomponent_new_impl(kind); } -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wvarargs" icalcomponent *icalcomponent_vanew(icalcomponent_kind kind, ...) { va_list args; @@ -131,7 +129,6 @@ icalcomponent *icalcomponent_vanew(icalcomponent_kind kind, ...) return impl; } -#pragma clang diagnostic pop icalcomponent *icalcomponent_new_from_string(const char *str) { diff --git a/src/libical/icalderivedproperty.c.in b/src/libical/icalderivedproperty.c.in index 93883b3a..ba21c759 100644 --- a/src/libical/icalderivedproperty.c.in +++ b/src/libical/icalderivedproperty.c.in @@ -66,10 +66,7 @@ struct icalproperty_enum_map const char *str; }; -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wvarargs" <insert_code_here> -#pragma clang diagnostic pop int icalproperty_kind_is_valid(const icalproperty_kind kind) { |