Fix utils test; move -Winline to C-only flags (it only harms C++)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8009304b584edeb59c199331a5724b3ab4430bdb..42168f65125947a68b8519fa40bb3219c0a8931a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -276,7 +276,6 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
         -Wcast-align
         -Wfloat-equal
         -Wformat-security
-        -Winline
         -Wmissing-format-attribute
         -Wpointer-arith
         -Wredundant-decls
@@ -292,6 +291,7 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
 
     set(NEEDED_C_COMPILER_FLAGS
         ${NEEDED_COMPILER_FLAGS}
+        -Winline
         -Wmissing-declarations
         -Wnested-externs
         -Wstrict-prototypes)

diff --git a/libtransmission/utils-test.c b/libtransmission/utils-test.c
index 88c8f6444812cc33387c5004106f0602d3e915fc..440be8c69651c25364e0a6b15a484c7f4a0e7bf3 100644 (file)
--- a/libtransmission/utils-test.c
+++ b/libtransmission/utils-test.c
@@ -121,7 +121,7 @@ test_utf8 (void)
   in = "\x92\xE0\xE3\xA4\xAD\xAE \xA1\xEB\xE2\xEC \x81\xAE\xA3\xAE\xAC";
   out = tr_utf8clean (in, 17);
   check (out != NULL);
-  check ((strlen (out) == 17) || (strlen (out) == 32));
+  check ((strlen (out) == 17) || (strlen (out) == 33));
   check (tr_utf8_validate (out, -1, NULL));
   tr_free (out);