Fix build error due to toolchain upgrade (gcc6->gcc9)

Change-Id: Iabb9f2f6a063f566c179d13010d7180f5ca09b33
Signed-off-by: Hyunsoo Park <hance.park@samsung.com>

diff --git a/include/scmirroring_private.h b/include/scmirroring_private.h
index e74e3f12cc68f1252b6625c59fe1a6aff8b464d3..bec2ef38975e45c30c732809a3a4f5f0a194b6c2 100644 (file)
--- a/include/scmirroring_private.h
+++ b/include/scmirroring_private.h
@@ -99,6 +99,79 @@ extern "C" {
 #define SCMIRRORING_STATE_CMD_STOP                     "STOP"
 #define SCMIRRORING_STATE_CMD_DESTROY          "DESTROY"
 
+#if !GLIB_CHECK_VERSION(2, 58, 0)
+#define G_SOURCE_FUNC(f) ((GSourceFunc) (void (*)(void)) (f))
+#endif /* !GLIB_CHECK_VERSION(2, 58, 0) */
+
+#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
+
+#ifdef _G_DEFINE_TYPE_EXTENDED_CLASS_INIT
+#undef _G_DEFINE_TYPE_EXTENDED_CLASS_INIT
+
+#define _G_DEFINE_TYPE_EXTENDED_CLASS_INIT(TypeName, type_name) \
+static void     type_name##_class_intern_init (gpointer klass, gpointer dummy) \
+{ \
+  type_name##_parent_class = g_type_class_peek_parent (klass); \
+  if (TypeName##_private_offset != 0) \
+    g_type_class_adjust_private_offset (klass, &TypeName##_private_offset); \
+  type_name##_class_init ((TypeName##Class*) klass); \
+}
+#else
+#define _G_DEFINE_TYPE_EXTENDED_CLASS_INIT(TypeName, type_name) \
+static void     type_name##_class_intern_init (gpointer klass, gpointer dummy) \
+{ \
+  type_name##_parent_class = g_type_class_peek_parent (klass); \
+  type_name##_class_init ((TypeName##Class*) klass); \
+}
+#endif /* _G_DEFINE_TYPE_EXTENDED_CLASS_INIT */
+
+#ifdef _G_DEFINE_TYPE_EXTENDED_BEGIN
+#undef _G_DEFINE_TYPE_EXTENDED_BEGIN
+
+#define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \
+\
+static void     type_name##_init              (TypeName        *self, gpointer dummy); \
+static void     type_name##_class_init        (TypeName##Class *klass); \
+static gpointer type_name##_parent_class = NULL; \
+static gint     TypeName##_private_offset; \
+\
+_G_DEFINE_TYPE_EXTENDED_CLASS_INIT(TypeName, type_name) \
+\
+G_GNUC_UNUSED \
+static inline gpointer \
+type_name##_get_instance_private (TypeName *self) \
+{ \
+  return (G_STRUCT_MEMBER_P (self, TypeName##_private_offset)); \
+} \
+\
+GType \
+type_name##_get_type (void) \
+{ \
+  static volatile gsize g_define_type_id__volatile = 0; \
+  if (g_once_init_enter (&g_define_type_id__volatile))  \
+    { \
+      GType g_define_type_id = \
+        g_type_register_static_simple (TYPE_PARENT, \
+                                       g_intern_static_string (#TypeName), \
+                                       sizeof (TypeName##Class), \
+                                       (GClassInitFunc) type_name##_class_intern_init, \
+                                       sizeof (TypeName), \
+                                       (GInstanceInitFunc) type_name##_init, \
+                                       (GTypeFlags) flags); \
+      { /* custom code follows */
+#define _G_DEFINE_TYPE_EXTENDED_END()   \
+        /* following custom code */ \
+      }                 \
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
+    }                   \
+  return g_define_type_id__volatile;    \
+} /* closes type_name##_get_type() */
+
+#endif /* _G_DEFINE_TYPE_EXTENDED_BEGIN */
+
+#endif /* GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 */
+
+
 typedef struct {
        int error_code;
        int src_state;

diff --git a/miracast_server/miracast_server.h b/miracast_server/miracast_server.h
index 7b7d7e789cf3b7e8b5a20fffa6274a3c5b65f4fe..499c06830b1d30e59e63746388f2b077c9a695a6 100644 (file)
--- a/miracast_server/miracast_server.h
+++ b/miracast_server/miracast_server.h
@@ -28,8 +28,7 @@ typedef struct _MiracastServer MiracastServer;
 typedef struct _MiracastServerClass MiracastServerClass;
 
 #define MIRACAST_SERVER_TYPE_OBJECT       (miracast_server_get_type())
-#define MIRACAST_SERVER(object)           (G_TYPE_CHECK_INSTANCE_CAST \
-                                                                               ((object), MIRACAST_SERVER_TYPE_OBJECT, MiracastServer))
+#define MIRACAST_SERVER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), MIRACAST_SERVER_TYPE_OBJECT, MiracastServer))
 #define MIRACAST_SERVER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), MIRACAST_SERVER_TYPE_OBJECT, MiracastServerClass))
 #define MIRACAST_SERVER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), MIRACAST_SERVER_TYPE_OBJECT, MiracastServerClass))
 #define MIRACAST_SERVER_CAST(obj)         ((MiracastServer*)(obj))

diff --git a/miracast_server/miracast_server_impl.c b/miracast_server/miracast_server_impl.c
index de9da00b252b2dc46bde6b222f5da699e20226f2..ee642cf5bf59ea1b2fb2922911c4b8ac7f545aa0 100644 (file)
--- a/miracast_server/miracast_server_impl.c
+++ b/miracast_server/miracast_server_impl.c
@@ -135,7 +135,7 @@ static void __miracast_server_quit_program(MiracastServer *server);
 static int __miracast_server_start(MiracastServer *server_obj);
 static gboolean __miracast_server_setup(MiracastServer *server_obj);
 
-static void miracast_server_init(MiracastServer *obj)
+static void miracast_server_init(MiracastServer *obj, gpointer dummy)
 {
        scmirroring_debug("miracast_server_init\n");
 
@@ -1059,7 +1059,7 @@ gboolean __miracast_server_read_cb(GIOChannel *src, GIOCondition condition, gpoi
        server->client_channel = channel;
 
        /* Set callback to be called when socket is readable */
-       g_source_set_callback(source, (GSourceFunc)__miracast_server_client_read_cb, server, NULL);
+       g_source_set_callback(source, G_SOURCE_FUNC(__miracast_server_client_read_cb), server, NULL);
        g_source_attach(source, g_main_context_get_thread_default());
 
        return TRUE;
@@ -1162,7 +1162,7 @@ gboolean miracast_server_setup(MiracastServer *server, GMainLoop *mainloop)
        source = g_io_create_watch(channel, G_IO_IN);
 
        /* Set callback to be called when socket is readable */
-       g_source_set_callback(source, (GSourceFunc)__miracast_server_read_cb, server, NULL);
+       g_source_set_callback(source, G_SOURCE_FUNC(__miracast_server_read_cb), server, NULL);
        g_source_attach(source, context);
 
        return TRUE;

diff --git a/packaging/capi-media-screen-mirroring.spec b/packaging/capi-media-screen-mirroring.spec
index b476a545c1bd268590053962c9d0a9bde1d4a779..1da5752b0907daee5ebf1a7dd1e2e3dc078c5359 100644 (file)
--- a/packaging/capi-media-screen-mirroring.spec
+++ b/packaging/capi-media-screen-mirroring.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-screen-mirroring
 Summary:    A screen mirroring library in Tizen C API
-Version:    0.2.8
+Version:    0.2.9
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/scmirroring_primary_sink.c b/src/scmirroring_primary_sink.c
index caee1d6b8a3fcb74e5dc1d38c3ac98aa0d0f28d0..03df7c146b081c38dd8ea95c543e80bdcb74a90d 100644 (file)
--- a/src/scmirroring_primary_sink.c
+++ b/src/scmirroring_primary_sink.c
@@ -982,7 +982,7 @@ static void __scmirroring_primary_src_set_callback_info(scmirroring_primary_sink
 
                GSource *src_user_cb = NULL;
                src_user_cb = g_idle_source_new();
-               g_source_set_callback(src_user_cb, (GSourceFunc)__scmirroring_primary_src_callback_call, scmirroring, NULL);
+               g_source_set_callback(src_user_cb, G_SOURCE_FUNC(__scmirroring_primary_src_callback_call), scmirroring, NULL);
                g_source_attach(src_user_cb, g_main_context_get_thread_default());
        } else {
                scmirroring_error("There is no callback");
@@ -1539,7 +1539,7 @@ try:
        int source_id = -1;
 
        /* Set callback to be called when socket is readable */
-       g_source_set_callback(source, (GSourceFunc)__scmirroring_primary_src_read_cb, _scmirroring, NULL);
+       g_source_set_callback(source, G_SOURCE_FUNC(__scmirroring_primary_src_read_cb), _scmirroring, NULL);
        source_id = g_source_attach(source, g_main_context_get_thread_default());
 
        _scmirroring->source_id = source_id;

diff --git a/src/scmirroring_secondary_sink.c b/src/scmirroring_secondary_sink.c
index 762b5f4b32e46318aaaff498234593ae3a0b1d5c..fcfb5543065f5f1c2f3b686cdc608c0420b9a03b 100755 (executable)
--- a/src/scmirroring_secondary_sink.c
+++ b/src/scmirroring_secondary_sink.c
@@ -548,7 +548,7 @@ int scmirroring_secondary_sink_set_coupled_sink(scmirroring_secondary_sink_h scm
 
        scmirroring_retvm_if(handle == NULL, SCMIRRORING_ERROR_INVALID_PARAMETER, "scmirroring_secondary_sink is NULL");
        scmirroring_retvm_if(handle->magic_num != SCMIRRORING_MAGIC_NUMBER, SCMIRRORING_ERROR_INVALID_PARAMETER, "scmirroring_secondary_sink is invalid handle");
-       scmirroring_retvm_if(address, SCMIRRORING_ERROR_INVALID_PARAMETER, "MAC address is invalid");
+       scmirroring_retvm_if(address == NULL, SCMIRRORING_ERROR_INVALID_PARAMETER, "MAC address is NULL");
 
        scmirroring_debug("address[%s]", address);
 

diff --git a/src/scmirroring_src.c b/src/scmirroring_src.c
index b37506864730e4715fcf13ca3be4b236dca33fed..5eb7aacb3abdecc6433803bb548040dbd1e01398 100644 (file)
--- a/src/scmirroring_src.c
+++ b/src/scmirroring_src.c
@@ -220,7 +220,7 @@ static void __scmirroring_src_set_callback_info(scmirroring_src_s *scmirroring,
 
                GSource *src_user_cb = NULL;
                src_user_cb = g_idle_source_new();
-               g_source_set_callback(src_user_cb, (GSourceFunc)__scmirroring_src_callback_call, scmirroring, NULL);
+               g_source_set_callback(src_user_cb, G_SOURCE_FUNC(__scmirroring_src_callback_call), scmirroring, NULL);
                g_source_attach(src_user_cb, g_main_context_get_thread_default());
        } else {
                scmirroring_error("There is no callback");
@@ -801,7 +801,7 @@ try:
        int source_id = -1;
 
        /* Set callback to be called when socket is readable */
-       g_source_set_callback(source, (GSourceFunc)__scmirroring_src_read_cb, _scmirroring, NULL);
+       g_source_set_callback(source, G_SOURCE_FUNC(__scmirroring_src_read_cb), _scmirroring, NULL);
        source_id = g_source_attach(source, g_main_context_get_thread_default());
 
        _scmirroring->source_id = source_id;

diff --git a/test/scmirroring_test.c b/test/scmirroring_test.c
index 615aaf91e2c074ef7fb3bcc26567a643a6ccb4e0..2b5a1a93d4765d07d0ce730d35cf8413fb95b155 100644 (file)
--- a/test/scmirroring_test.c
+++ b/test/scmirroring_test.c
@@ -157,7 +157,9 @@ static void __interpret(char *cmd)
        return;
 }
 
-gboolean __input(GIOChannel *channel)
+static gboolean __input(GIOChannel *channel,
+                                       GIOCondition  cond,
+                                       gpointer      data)
 {
        char buf[MAX_STRING_LEN + 3];
        gsize read;

diff --git a/test/scmirroring_wifi_direct_test.c b/test/scmirroring_wifi_direct_test.c
index 50cc1d3a3551ced8ba814d27a17308ba306fba44..0eac91becf286100fcbed0ac0f3c9cdcd2c9242c 100755 (executable)
--- a/test/scmirroring_wifi_direct_test.c
+++ b/test/scmirroring_wifi_direct_test.c
@@ -170,7 +170,9 @@ static void __interpret(char *cmd)
        return;
 }
 
-gboolean __input(GIOChannel *channel)
+static gboolean __input(GIOChannel *channel,
+                                       GIOCondition  cond,
+                                       gpointer      data)
 {
        char buf[MAX_STRING_LEN + 3];
        gsize read;

diff --git a/test_sink/scmirroring_primary_sink_test.c b/test_sink/scmirroring_primary_sink_test.c
index 930626af7daf24381c51e0da1ea2c790584da4c5..07124fe720504c8c76bd5d876c2c1bea715b1682 100644 (file)
--- a/test_sink/scmirroring_primary_sink_test.c
+++ b/test_sink/scmirroring_primary_sink_test.c
@@ -897,7 +897,9 @@ static void __interpret(char *cmd)
        return;
 }
 
-gboolean __input(GIOChannel *channel)
+static gboolean __input(GIOChannel *channel,
+                                       GIOCondition  cond,
+                                       gpointer      data)
 {
        char buf[MAX_STRING_LEN + 3];
        gsize read;

diff --git a/test_sink/scmirroring_secondary_sink_test.c b/test_sink/scmirroring_secondary_sink_test.c
index de81852537771761c86d9cc4774539134278d184..a9d560d0c46047751df8a4c39c73bbdea38ebffa 100755 (executable)
--- a/test_sink/scmirroring_secondary_sink_test.c
+++ b/test_sink/scmirroring_secondary_sink_test.c
@@ -227,7 +227,9 @@ static void __interpret(char *cmd)
 }
 
 
-gboolean __input(GIOChannel *channel)
+static gboolean __input(GIOChannel *channel,
+                                       GIOCondition  cond,
+                                       gpointer      data)
 {
        char buf[MAX_STRING_LEN + 3];
        gsize read;

diff --git a/test_sink/scmirroring_sink_test.c b/test_sink/scmirroring_sink_test.c
index aafae0179304ff0e5c19ef576a50114e70f39e2c..0106d80793fa6b770aa61e13f8295848b48c52fe 100644 (file)
--- a/test_sink/scmirroring_sink_test.c
+++ b/test_sink/scmirroring_sink_test.c
@@ -840,7 +840,9 @@ static void __interpret(char *cmd)
        return;
 }
 
-gboolean __input(GIOChannel *channel)
+static gboolean __input(GIOChannel *channel,
+                                       GIOCondition  cond,
+                                       gpointer      data)
 {
        char buf[MAX_STRING_LEN + 3];
        gsize read;

diff --git a/test_sink/scmirroring_sink_test.c.wifi b/test_sink/scmirroring_sink_test.c.wifi
index 2c5595243f3a45b9ecd76c87318dd18d67c302f6..23a5b378bc53a840300015d40fcd7a919676549b 100755 (executable)
--- a/test_sink/scmirroring_sink_test.c.wifi
+++ b/test_sink/scmirroring_sink_test.c.wifi
@@ -287,7 +287,9 @@ static void __interpret (char *cmd)
 return;
 }
 
-gboolean __input (GIOChannel *channel)
+static gboolean __input(GIOChannel *channel,
+                                       GIOCondition  cond,
+                                       gpointer      data)
 {
        char buf[MAX_STRING_LEN + 3];
        gsize read;

diff --git a/test_sink/scmirroring_sink_test_SBS.c b/test_sink/scmirroring_sink_test_SBS.c
index 2e236a9d5ca5fa9f0ab3500e2d2a19561e9672f0..309b70e4fa854fea5619808398f462410280fad8 100644 (file)
--- a/test_sink/scmirroring_sink_test_SBS.c
+++ b/test_sink/scmirroring_sink_test_SBS.c
@@ -847,7 +847,9 @@ static void __interpret(char *cmd)
        return;
 }
 
-gboolean __input(GIOChannel *channel)
+static gboolean __input(GIOChannel *channel,
+                                       GIOCondition  cond,
+                                       gpointer      data)
 {
        char buf[MAX_STRING_LEN + 3];
        gsize read;