From: Jiwan Kim <ji-wan.kim@samsung.com>
Date: Tue, 24 Mar 2015 11:26:15 +0000 (+0900)
Subject: Fix for 64-bit build compatibility
X-Git-Tag: submit/tizen_mobile/20150326.074959^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e8214cada062d4ac2c459ddc2962ea46f49da581;p=platform%2Fcore%2Ftelephony%2Flibtapi.git

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 7dfc9a3..607369a 100644
--- 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 f0b2520..31039a6 100644
--- 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 a11fff5..eb129fe 100644
--- 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 ef058d6..aaa33fb 100644
--- 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 7dc07a9..8e21491 100644
--- 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;