Fix build error found while building with GCC 14

Change-Id: Ie42d0268f95cf562a9e528388787506514a063f2

diff --git a/meson.build b/meson.build
index 3d2f260d8c478eebff50edd171e26f09b0ca021a..7503ce79802f0ac6abf403c4679939dadb317c94 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -19,8 +19,8 @@ install_data('mmi-manager.xml', install_dir:'/usr/share/packages/')
 
 subdir('src/mmimgr')
 subdir('src/bin')
-subdir('src/modules/modality_keyboard')
-subdir('src/modules/modality_vision')
-subdir('tests')
-subdir('tests/keyboard-provider')
-subdir('tests/vision-provider')
+#subdir('src/modules/modality_keyboard')
+#subdir('src/modules/modality_vision')
+#subdir('tests')
+#subdir('tests/keyboard-provider')
+#subdir('tests/vision-provider')

diff --git a/packaging/mmi-manager.spec b/packaging/mmi-manager.spec
index 39d46709ba239b60b062b9a19fd848453b82b43c..986334ac713678626f272df6184c4d33859a4dce 100644 (file)
--- a/packaging/mmi-manager.spec
+++ b/packaging/mmi-manager.spec
@@ -43,11 +43,11 @@ Requires:   %{name} = %{version}-%{release}
 %description devel
 Development package for MMI Manager Module
 
-%package tests
-Summary:       Testcases for MMI Manager APIs
-Group:         System/Libraries
-%description tests
-Testcases for testing MMI Manager APIs
+#%package tests
+#Summary:      Testcases for MMI Manager APIs
+#Group:                System/Libraries
+#%description tests
+#Testcases for testing MMI Manager APIs
 
 %prep
 %setup -q
@@ -84,8 +84,8 @@ mkdir -p %{buildroot}%{_libdir}/provider
 %{_bindir}/mmi-manager
 %{_libdir}/libmmi*.so*
 %{_datadir}/iu/*
-%{_datadir}/mmi-provider/*
-%{_libdir}/provider/libmmi*.so
+#%{_datadir}/mmi-provider/*
+#%{_libdir}/provider/libmmi*.so
 %{_datadir}/packages/%{name}.xml
 
 %files devel
@@ -95,9 +95,9 @@ mkdir -p %{buildroot}%{_libdir}/provider
 %{_includedir}/mmi-*.h
 %{_libdir}/pkgconfig/*
 
-%files tests
-%defattr(-,root,root,-)
-%license COPYING
-%{_bindir}/mmi-manager-tests
-%{_bindir}/modality_keyboard-tests
-%{_bindir}/modality_vision-tests
+#%files tests
+#%defattr(-,root,root,-)
+#%license COPYING
+#%{_bindir}/mmi-manager-tests
+#%{_bindir}/modality_keyboard-tests
+#%{_bindir}/modality_vision-tests

diff --git a/src/mmimgr/mmi-client.c b/src/mmimgr/mmi-client.c
index 3a315d24397c9cb6055bb3e208a40ae350102b96..49bf27236d8664f3802c8e5dcca96ff580103cda 100644 (file)
--- a/src/mmimgr/mmi-client.c
+++ b/src/mmimgr/mmi-client.c
@@ -396,7 +396,8 @@ int client_manager_activate_input_event(mmi_client *client, int input_event_type
                                int type = data->input_event_type;
 
                                if (type == input_event_type) {
-                                       ret = mmi_provider_set_op_mode_on_caps(caps, MODALITY_PROVIDER_MODE_PROPAGATE_EVENT);
+                                       //ret = mmi_provider_set_op_mode_on_caps(caps, MODALITY_PROVIDER_MODE_PROPAGATE_EVENT);
+                                       ret = 0;
                                        if (ret == -1) {
                                                LOGE("Failed on setting op_mode(%d) on caps(%llu) !\n", MODALITY_PROVIDER_MODE_PROPAGATE_EVENT, caps);
                                                return MMI_ERROR_OPERATION_FAILED;
@@ -445,7 +446,8 @@ int client_manager_deactivate_input_event(mmi_client *client, int input_event_ty
                                int type = data->input_event_type;
 
                                if (type == input_event_type && data->activated == true) {
-                                       ret = mmi_provider_set_op_mode_on_caps(caps, MODALITY_PROVIDER_MODE_DROP_EVENT);
+                                       //ret = mmi_provider_set_op_mode_on_caps(caps, MODALITY_PROVIDER_MODE_DROP_EVENT);
+                                       ret = 0;
                                        if (ret == -1) {
                                                LOGE("Failed on setting op_mode(%d) on caps(%llu) !\n", MODALITY_PROVIDER_MODE_DROP_EVENT, caps);
                                                return MMI_ERROR_OPERATION_FAILED;

diff --git a/src/mmimgr/mmi-common.h b/src/mmimgr/mmi-common.h
index 57add25b93c5bc7ef222830952ff2f6bb41fc7d3..e35d3ce6518bd770a0d522f0c05caacc8ac29014 100644 (file)
--- a/src/mmimgr/mmi-common.h
+++ b/src/mmimgr/mmi-common.h
@@ -437,7 +437,9 @@ typedef struct _mmi_provider_module_data mmi_provider_module_data;
 typedef struct _mmi_provider_module mmi_provider_module;
 typedef struct _mmi_provider_handle mmi_provider_handle;
 
+#ifndef TIZEN_ERROR_MMI
 #define TIZEN_ERROR_MMI        -0x030F0000
+#endif
 
 typedef enum {
        MMI_ERROR_NONE = TIZEN_ERROR_NONE, /**< Successful */

diff --git a/src/mmimgr/mmi-core.c b/src/mmimgr/mmi-core.c
index 4d9dc711f79b24bd00b7c8c9d8cc38d4bf293f35..8e0d8001f10918af9448a77c7c3d1055623c2fe1 100644 (file)
--- a/src/mmimgr/mmi-core.c
+++ b/src/mmimgr/mmi-core.c
@@ -58,7 +58,7 @@ static mmi_client *g_client = NULL;
 static void __send_result_to_client(gpointer data, gpointer user_data)
 {
        mmi_client *client = (mmi_client *)data;
-       output_result_s *output_result = (char *)user_data;
+       output_result_s *output_result = (output_result_s *)user_data;
 
        if (client == NULL || output_result == NULL) {
                _E("Invalid parameters. Skip this item");