diff options
| author | Hwankyu Jhun <h.jhun@samsung.com> | 2015-12-16 08:03:58 +0900 |
|---|---|---|
| committer | Hwankyu Jhun <h.jhun@samsung.com> | 2015-12-16 08:03:58 +0900 |
| commit | cca0e355ea47118bbbb1c84f1b75818cc9381afa (patch) | |
| tree | ed3d38f7092819b67026640b99c90d972270aee9 | |
| parent | 8a0850e2b006f30b086289c23eb484610509b76a (diff) | |
| download | aul-1-cca0e355ea47118bbbb1c84f1b75818cc9381afa.tar.gz aul-1-cca0e355ea47118bbbb1c84f1b75818cc9381afa.tar.bz2 aul-1-cca0e355ea47118bbbb1c84f1b75818cc9381afa.zip | |
fix type casting for 64-bit env
Change-Id: I3e5ba1bada9e9c0a1087360cfac456536535b41a
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
| -rw-r--r-- | am_daemon/amd_app_group.c | 2 | ||||
| -rwxr-xr-x | src/aul_rsc_mgr.c | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/am_daemon/amd_app_group.c b/am_daemon/amd_app_group.c index 9025e71c..51cf26b9 100644 --- a/am_daemon/amd_app_group.c +++ b/am_daemon/amd_app_group.c @@ -1268,7 +1268,7 @@ void app_group_lower(int pid, int *exit) __detach_window(ac->wid); ac->can_shift = 0; #ifdef WAYLAND - ecore_wl_window_lower((Ecore_Wl_Window *)ac->wid); + ecore_wl_window_lower((Ecore_Wl_Window *)((intptr_t)ac->wid)); #else /* ecore_x_window_lower(ac->wid); */ #endif diff --git a/src/aul_rsc_mgr.c b/src/aul_rsc_mgr.c index ce0b4677..7c225389 100755 --- a/src/aul_rsc_mgr.c +++ b/src/aul_rsc_mgr.c @@ -20,6 +20,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <stdint.h> #include <glib/gstdio.h> #include <bundle_internal.h> #include <assert.h> @@ -236,7 +237,7 @@ static void __bundle_iterator_get_valid_nodes(const char *key, const int type, bundle_keyval_get_basic_val((bundle_keyval_t *) kv, (void**) &val, &size); - node_attr = (guint) g_hash_table_lookup(attr_key, key); + node_attr = (uintptr_t)g_hash_table_lookup(attr_key, key); if (node_attr <= NODE_ATTR_MIN || node_attr >= NODE_ATTR_MAX) { LOGE("INVALID_PARAMETER(0x%08x), node_attr(%d)", AUL_RESOURCE_ERROR_INVALID_PARAMETER, node_attr); @@ -306,9 +307,9 @@ static void __bundle_iterator_get_best_node(const char *key, const char *val, void *data) { unsigned int node_attr; - unsigned int *weight = (unsigned int *) data; + unsigned int *weight = (unsigned int *)data; - node_attr = (guint) g_hash_table_lookup(attr_key, key); + node_attr = (uintptr_t)g_hash_table_lookup(attr_key, key); if (node_attr <= NODE_ATTR_MIN || node_attr >= NODE_ATTR_MAX) { LOGE("INVALID_PARAMETER(0x%08x), node_attr(%d)", AUL_RESOURCE_ERROR_INVALID_PARAMETER, node_attr); @@ -979,8 +980,8 @@ static int __init(const char *rsc_folder_path, bundle *b) unsigned int i; for (i = 0; i < ARRAY_SIZE(map); i++) { - g_hash_table_insert(attr_key, (char *) map[i].bundle_attr_key, - (gpointer) (map[i].bundle_attr_value)); + g_hash_table_insert(attr_key, (char *)map[i].bundle_attr_key, + (gpointer)((uintptr_t)(map[i].bundle_attr_value))); } } |