Support 64bit architecture

Change-Id: I9ee26cbdee99f19b051879e819802ea430e8f3d6

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bb3989..d84b5e2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ SET(SRCS
 SET(PACKAGE ${PROJECT_NAME})
 SET(PKGNAME ${PACKAGE})
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(LIBDIR "${PREFIX}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
     SET(CMAKE_BUILD_TYPE "Release")
@@ -67,4 +67,4 @@ INSTALL(FILES "${CMAKE_SOURCE_DIR}/src/sclcoretypes.h" DESTINATION include/libsc
 INSTALL(FILES "${CMAKE_SOURCE_DIR}/src/sclcorecallback.h" DESTINATION include/libscl-core)
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIBDIR}/pkgconfig)

diff --git a/packaging/libscl-core.spec b/packaging/libscl-core.spec
index c346554..0a6da98 100644 (file)
--- a/packaging/libscl-core.spec
+++ b/packaging/libscl-core.spec
@@ -48,9 +48,9 @@ rm -rf CMakeFiles
 rm -rf CMakeCache.txt
 
 %if %{with wayland}
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -Dwith_wayland=TRUE
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR:PATH=%{_libdir} -Dwith_wayland=TRUE
 %else
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR:PATH=%{_libdir}
 %endif
 make %{?jobs:-j%jobs}
 

diff --git a/src/sclconnection-isf.cpp b/src/sclconnection-isf.cpp
index b178d9a..2a47667 100644 (file)
--- a/src/sclconnection-isf.cpp
+++ b/src/sclconnection-isf.cpp
@@ -211,7 +211,8 @@ static void slot_set_imdata (const scim::HelperAgent *agent, char *buf, size_t &
     if (impl) {
         ISCLCoreEventCallback *callback = impl->get_core_event_callback();
         if (callback) {
-            callback->on_set_imdata(buf, len);
+            scl32 _len = static_cast<scl32>(reinterpret_cast<size_t>(len) & 0xffffffff);
+            callback->on_set_imdata(buf, _len);
         }
     }
 }
@@ -221,7 +222,9 @@ static void slot_get_imdata (const scim::HelperAgent *, char **buf, size_t &len)
     if (impl) {
         ISCLCoreEventCallback *callback = impl->get_core_event_callback();
         if (callback) {
-            callback->on_get_imdata(buf, &len);
+            sclu32 _len = 0;
+            callback->on_get_imdata(buf, &_len);
+            len = _len;
         }
     }
 }