From d41599748a5fbdf268a4a7a483ec9d6f483b1631 Mon Sep 17 00:00:00 2001 From: SeokHoon Lee Date: Fri, 20 Jan 2017 10:21:01 +0900 Subject: [PATCH] Fix build error for upgrading toolchain Different semantics for inline functions While -std=gnu89 employs the GNU89 inline semantics, -std=gnu11 uses the C99 inline semantics. For further informaion, please refer to 'https://gcc.gnu.org/gcc-5/porting_to.html' Remove unused function. Signed-off-by: SeokHoon Lee Change-Id: I8e7d567f35e3c82d7437619e7a4dab869a9ec3bb --- packaging/libmm-streamrecorder.spec | 2 +- src/include/mm_streamrecorder_util.h | 6 ++---- src/mm_streamrecorder_util.c | 18 ++---------------- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/packaging/libmm-streamrecorder.spec b/packaging/libmm-streamrecorder.spec index f63eaf5..be7d419 100644 --- a/packaging/libmm-streamrecorder.spec +++ b/packaging/libmm-streamrecorder.spec @@ -1,6 +1,6 @@ Name: libmm-streamrecorder Summary: Media Stream Recorder library -Version: 0.0.11 +Version: 0.0.12 Release: 0 Group: Multimedia/Other License: Apache-2.0 diff --git a/src/include/mm_streamrecorder_util.h b/src/include/mm_streamrecorder_util.h index 387badc..09bf1c2 100644 --- a/src/include/mm_streamrecorder_util.h +++ b/src/include/mm_streamrecorder_util.h @@ -170,10 +170,8 @@ void _mmstreamrecorder_err_trace_write(char *str_filename, char *func_name, int guint16 get_language_code(const char *str); gchar *str_to_utf8(const gchar *str); -inline gboolean write_tag(FILE *f, const gchar *tag); -inline gboolean write_to_32(FILE *f, guint val); -inline gboolean write_to_16(FILE *f, guint val); -inline gboolean write_to_24(FILE *f, guint val); +__attribute__ ((gnu_inline)) inline gboolean write_tag(FILE *f, const gchar *tag); +__attribute__ ((gnu_inline)) inline gboolean write_to_32(FILE *f, guint val); #ifdef __cplusplus } #endif diff --git a/src/mm_streamrecorder_util.c b/src/mm_streamrecorder_util.c index d7a5b96..6666ed5 100644 --- a/src/mm_streamrecorder_util.c +++ b/src/mm_streamrecorder_util.c @@ -313,7 +313,7 @@ gchar *str_to_utf8(const gchar * str) return g_convert(str, -1, "UTF-8", "ASCII", NULL, NULL, NULL); } -inline gboolean write_tag(FILE *f, const gchar *tag) +__attribute__ ((gnu_inline)) inline gboolean write_tag(FILE *f, const gchar *tag) { while (*tag) FPUTC_CHECK(*tag++, f); @@ -321,7 +321,7 @@ inline gboolean write_tag(FILE *f, const gchar *tag) return TRUE; } -inline gboolean write_to_32(FILE *f, guint val) +__attribute__ ((gnu_inline)) inline gboolean write_to_32(FILE *f, guint val) { FPUTC_CHECK(val >> 24, f); FPUTC_CHECK(val >> 16, f); @@ -329,17 +329,3 @@ inline gboolean write_to_32(FILE *f, guint val) FPUTC_CHECK(val, f); return TRUE; } - -inline gboolean write_to_16(FILE *f, guint val) -{ - FPUTC_CHECK(val >> 8, f); - FPUTC_CHECK(val, f); - return TRUE; -} - -inline gboolean write_to_24(FILE *f, guint val) -{ - write_to_16(f, val >> 8); - FPUTC_CHECK(val, f); - return TRUE; -} -- 2.7.4