fixup! Add support for gcov by gcc version

Change-Id: I42595acb0c462f7442bcccc6a8750df3b129da39

diff --git a/core/include/muse_core.h b/core/include/muse_core.h
index 692a4690844f6c4629ddd43e63c431807f0ead7d..540025d9ae64174b53edb3c1de465b88310268f2 100644 (file)
--- a/core/include/muse_core.h
+++ b/core/include/muse_core.h
@@ -88,8 +88,16 @@ typedef struct muse_external_storage_info {
 } muse_external_storage_info_t;
 
 #ifdef MUSE_GCOV_TEST
+#if (defined(__GNUC__) \
+       && ((__GNUC__ == 11 && __GNUC_MINOR__ >= 1) || (__GNUC__ >= 12))) \
+       || (defined(__clang__) && (__clang_major__ >= 12))
+extern void __gcov_dump(void);
+extern void __gcov_reset(void);
+       #define __gcov_flush() do { __gcov_dump(); __gcov_reset(); } while (0)
+#else
 extern void __gcov_flush(void);
 #endif
+#endif
 
 int muse_core_connection_close(int sock_fd);
 int muse_core_set_nonblocking(int fd, bool value);

diff --git a/core/src/muse_core.c b/core/src/muse_core.c
index 21be2d0e3abb908f9dfec11fc4ff8af120b0e2fe..6eaa0ebe86a6de011c76859d6757e393a917a491 100644 (file)
--- a/core/src/muse_core.c
+++ b/core/src/muse_core.c
@@ -50,16 +50,6 @@ static gboolean _muse_msg_json_get_obj_value(json_object *obj, muse_core_msg_typ
 
 #ifdef MUSE_GCOV_TEST
 
-#if (defined(__GNUC__) \
-       && ((__GNUC__ == 11 && __GNUC_MINOR__ >= 1) || (__GNUC__ >= 12))) \
-       || (defined(__clang__) && (__clang_major__ >= 12))
-extern "C" void __gcov_dump(void);
-extern "C" void __gcov_reset(void);
-       #define __gcov_flush() do { __gcov_dump(); __gcov_reset(); } while (0)
-#else
-extern "C" void __gcov_flush(void);
-#endif
-
 void muse_core_gcov_flush(void)
 {
        __gcov_flush();

diff --git a/packaging/mused.spec b/packaging/mused.spec
index d24c7ade6aefc2f7980582af3e031d4cfc825e30..9fa35354e70deed4ada7fa427421d28e244d1fff 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.4.4
+Version:    0.4.5
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0