[wifi-direct-manager]Fix build errors for 64bit

Change-Id: Id2b458a18cb1f7f871493f2052a8b43694a28f94
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index bb9367b..4f39fdc 100755 (executable)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -54,7 +54,7 @@ export ARCH=i586
 
 %endif
 
-cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
 %if 0%{?model_build_feature_wlan_concurrent_mode}
        -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \
 %endif
@@ -78,7 +78,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
 -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
 -DTIZEN_FEATURE_WIFI_DISPLAY=1 \
 -DCTRL_IFACE_DBUS=1 \
-       .
+-DCMAKE_LIB_DIR=%{_libdir}
 
 make %{?_smp_mflags}
 

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/CMakeLists.txt b/plugin/wpasupplicant/ctrl_iface_dbus/CMakeLists.txt
index 60b1077..c281985 100755 (executable)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/CMakeLists.txt
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/CMakeLists.txt
@@ -8,6 +8,7 @@ FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
+SET(LIBDIR ${CMAKE_LIB_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oem)
 INCLUDE_DIRECTORIES(SRCS include)
 
@@ -27,4 +28,4 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "" OUTPUT_NAME ${PROJECT_NAME})
 
 # install
-INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib)
+INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR})

diff --git a/src/wifi-direct-client.c b/src/wifi-direct-client.c
index f3b11e1..a43caa4 100755 (executable)
--- a/src/wifi-direct-client.c
+++ b/src/wifi-direct-client.c
@@ -477,7 +477,7 @@ Ignore the check for now*/
                GIOChannel *gio = NULL;
                gio = g_io_channel_unix_new(sock);
                client->gsource_id = g_io_add_watch(gio, G_IO_IN | G_IO_ERR | G_IO_HUP,
-                                                       (GIOFunc) wfd_client_process_request, (gpointer) sock);
+                                                       (GIOFunc) wfd_client_process_request, (gpointer) (void *)(intptr_t)sock);
                g_io_channel_unref(gio);
 
                manager->clients = g_list_prepend(manager->clients, (gpointer) client);
@@ -532,7 +532,7 @@ done:
 static gboolean _wfd_remove_event_source(gpointer data)
 {
        __WDS_LOG_FUNC_ENTER__;
-       int source_id = (int) data;
+       int source_id = (intptr_t) data;
        int res = 0;
 
        if (source_id < 0) {
@@ -578,7 +578,7 @@ static int _wfd_deregister_client(void *data, int client_id)
        if (client->ssock >= SOCK_FD_MIN)
                close(client->ssock);
        client->ssock = -1;
-       g_idle_add((GSourceFunc) _wfd_remove_event_source, (gpointer) client->gsource_id);
+       g_idle_add((GSourceFunc) _wfd_remove_event_source, (gpointer) (void *)(intptr_t)client->gsource_id);
        client->gsource_id = 0;
 
        g_free(client);
@@ -880,7 +880,7 @@ static gboolean wfd_client_process_request(GIOChannel *source,
                                                                        gpointer user_data)
 {
        __WDS_LOG_FUNC_ENTER__;
-       int sock = (int) user_data;
+       int sock = (intptr_t) user_data;
        wifi_direct_client_request_s req;
        wifi_direct_client_response_s rsp;
        char *extra_rsp = NULL;

diff --git a/src/wifi-direct-service.c b/src/wifi-direct-service.c
index dfee6a0..2c1dd72 100644 (file)
--- a/src/wifi-direct-service.c
+++ b/src/wifi-direct-service.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <glib.h>
 #include <wifi-direct.h>
@@ -39,7 +40,7 @@ int wfd_service_add(GList **services, int type, char *info_str, int *service_id)
        }
 
        service->type = type;
-       service->id = (int) &service;
+       service->id = (intptr_t) &service;
 
        info1 = g_strndup(info_str, strlen(info_str));
        if(info1 == NULL) {