Fix for 64-bit build compatibility

Change-Id: I55c5f60a03a5162594f36306f761e3ea84dbbe78
Signed-off-by: Jiwan Kim <ji-wan.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dfc9a3afd431feb5b474dd0e3211bc9b12653a2..607369a16f0a7d5193880fa66bb09cf5db1a44f2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(SLP-tapi C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include")
 
 # Set required packages
@@ -54,8 +54,8 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 CONFIGURE_FILE(tapi.pc.in tapi.pc @ONLY)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/telephony-client)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tapi.pc DESTINATION lib/pkgconfig)
-INSTALL(TARGETS SLP-tapi DESTINATION lib COMPONENT Runtime)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tapi.pc DESTINATION ${LIBDIR}/pkgconfig)
+INSTALL(TARGETS SLP-tapi DESTINATION ${LIBDIR} COMPONENT Runtime)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME libslp-tapi)
 IF (TIZEN_ENGINEER_MODE)
        ADD_SUBDIRECTORY(test_src)

diff --git a/packaging/libtapi.spec b/packaging/libtapi.spec
index f0b25206f29df6ea7ddecad25ecf02ccf58a7ee0..31039a6137303b5e4f99ca514d7bb57e517a7196 100644 (file)
--- a/packaging/libtapi.spec
+++ b/packaging/libtapi.spec
@@ -43,6 +43,7 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 
 
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DLIB_INSTALL_DIR=%{_libdir} \
        -DTIZEN_ENGINEER_MODE=1 \
 
 make %{?_smp_mflags}

diff --git a/test_src/main.c b/test_src/main.c
index a11fff5decdfc7d364d7d5de121101dc1c7dd051..eb129fee11eede3bf1646ca840aec9616658dd99 100644 (file)
--- a/test_src/main.c
+++ b/test_src/main.c
@@ -65,7 +65,7 @@ static int get_modem_info(MManager *mm, struct menu_data *menu)
        int i = 0;
 
        while (cp_list[i]) {
-               msg("[%02d] strlen(%d), '%s'", i, strlen(cp_list[i]), cp_list[i]);
+               msg("[%02d] strlen(%d), '%s'", i, (unsigned int)strlen(cp_list[i]), cp_list[i]);
                i++;
        }
 

diff --git a/test_src/menu.c b/test_src/menu.c
index ef058d60caac7e68b5d15e4771520868d4da837b..aaa33fb99e2fa033efc686977f4962fd1318897b 100644 (file)
--- a/test_src/menu.c
+++ b/test_src/menu.c
@@ -150,7 +150,7 @@ static void _show_menu (MManager *m, struct menu_data menu[])
                }
 
                if (item->sub_menu) {
-                       msg ("\e[1A\e[%dC >", POS_MORE);
+                       msg ("\e[1A\e[%dC >", (int)POS_MORE);
                }
 
                i++;

diff --git a/test_src/sms_util.c b/test_src/sms_util.c
index 7dc07a9985c8294c718fdebb24a49a6495f43769..8e214914f034e95c0ef8b0d6852497a2f50aeda9 100644 (file)
--- a/test_src/sms_util.c
+++ b/test_src/sms_util.c
@@ -499,9 +499,9 @@ int SmsUtilDecodeScAddrField( SmsAddressInfo_t* pSmsAddrField, unsigned char* pA
 
                local_index++; /* ignore Type of Address field */
 
-               SmsUtilConvertBCD2Digit( (char*) pSmsAddrField->DialNumLen, (char*) &pAddrField[local_index], pSmsAddrField->DialNumLen );
+               SmsUtilConvertBCD2Digit( (char*) pSmsAddrField->szDiallingNum, (char*) &pAddrField[local_index], pSmsAddrField->DialNumLen );
 
-               printf( "SmsUtilDecodeScAddrField: diallingNum [%s].\n", (char*) pSmsAddrField->DialNumLen  );
+               printf( "SmsUtilDecodeScAddrField: diallingNum [%s].\n", (char*) pSmsAddrField->szDiallingNum  );
 
                printf( "length=%d , ton %d, npi =%d\n",pSmsAddrField->DialNumLen, pSmsAddrField->Ton,pSmsAddrField->Npi );
        }
@@ -531,7 +531,7 @@ int SmsUtilDecodeScAddrField( SmsAddressInfo_t* pSmsAddrField, unsigned char* pA
 
        local_index++; // SET_TON_NPI �� MACRO �̹Ƿ� ���ο��� ������Ű�� ���׹߻�
 
-       SmsUtilConvertDigit2BCD( (char*) &pAddrField[local_index], (char*) pSmsAddrField->DialNumLen, pSmsAddrField->DialNumLen );
+       SmsUtilConvertDigit2BCD( (char*) &pAddrField[local_index], (char*) pSmsAddrField->szDiallingNum, pSmsAddrField->DialNumLen );
 
        if ( pSmsAddrField->DialNumLen % 2 )
                local_index += pSmsAddrField->DialNumLen / 2 + 1;