Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/923?usp=email
to review the following change.
Change subject: CMake: Sync list of compiler flags with configure.ac
......................................................................
CMake: Sync list of compiler flags with configure.ac
Also fix one issue reported by the build.
Change-Id: I28af9eac2e9fb615903a82c8f4087602b72c134d
Signed-off-by: Frank Lichtenheld <fr...@lichtenheld.com>
---
M CMakeLists.txt
M tests/unit_tests/openvpn/test_cryptoapi.c
2 files changed, 11 insertions(+), 6 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/23/923/1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b04adce..ba11056 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,6 +66,13 @@
CACHE STRING "Flags used by the C++ compiler during AddressSanitizer
builds."
FORCE)
+function(check_and_add_compiler_flag flag variable)
+ check_c_compiler_flag(${flag} ${variable})
+ if (${variable})
+ add_compile_options(${flag})
+ endif()
+endfunction()
+
if (MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
-D_WINSOCK_DEPRECATED_NO_WARNINGS)
if (USE_WERROR)
@@ -96,11 +103,9 @@
endif()
else ()
add_compile_options(-Wall -Wuninitialized)
- check_c_compiler_flag(-Wno-stringop-truncation NoStringOpTruncation)
-
- if (${NoStringOpTruncation})
- add_compile_options(-Wno-stringop-truncation)
- endif()
+ check_and_add_compiler_flag(-Wno-stringop-truncation NoStringOpTruncation)
+ check_and_add_compiler_flag(-Wstrict-prototypes StrictPrototypes)
+ check_and_add_compiler_flag(-Wold-style-definition OldStyleDefinition)
# We are not ready for this
#add_compile_options(-Wconversion -Wno-sign-conversion -Wsign-compare)
if (USE_WERROR)
diff --git a/tests/unit_tests/openvpn/test_cryptoapi.c
b/tests/unit_tests/openvpn/test_cryptoapi.c
index 98102ef..478995f 100644
--- a/tests/unit_tests/openvpn/test_cryptoapi.c
+++ b/tests/unit_tests/openvpn/test_cryptoapi.c
@@ -116,7 +116,7 @@
/* Fill-in certs[] array */
void
-init_cert_data()
+init_cert_data(void)
{
struct test_cert certs_local[] = {
{cert1, key1, cname1, "OVPN TEST CA1", "OVPN Test Cert 1", hash1,
1},
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/923?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I28af9eac2e9fb615903a82c8f4087602b72c134d
Gerrit-Change-Number: 923
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: plaisthos <arne-open...@rfc2549.org>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
