From: Mike Gelfand <mikedld@mikedld.com>
Date: Thu, 11 Dec 2014 05:25:26 +0000 (+0000)
Subject: Fix utils test; move -Winline to C-only flags (it only harms C++)
X-Git-Tag: 2.90~321
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7de6a52e14579bed75f36c3cf3398d8213b3bcb2;p=transmission

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8009304b5..42168f651 100644
--- 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 88c8f6444..440be8c69 100644
--- 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);