Fix build for 64bit
authorRafal Galka <r.galka@samsung.com>
Wed, 8 Jul 2015 13:20:49 +0000 (15:20 +0200)
committerRafal Galka <r.galka@samsung.com>
Wed, 8 Jul 2015 13:20:49 +0000 (15:20 +0200)
Change-Id: Ia3ec91ed7ec5ce8deb6ff5c8e3440c2e68908ef5

packaging/webapi-plugins.spec
src/datacontrol/datacontrol_instance.cc
src/power/power_manager.cc
src/push/push_manager.cc

index d239b10ceae31aafe893d8eba0920d8a8cd4df9a..86ef1545053f503fb9731f94dc26fe0ecb175d32 100755 (executable)
@@ -46,7 +46,7 @@ Source0:    %{name}-%{version}.tar.gz
 %define tizen_feature_calendar_support            1
 %define tizen_feature_contact_support             1
 %define tizen_feature_content_support             1
-%define tizen_feature_datacontrol_support         0
+%define tizen_feature_datacontrol_support         1
 %define tizen_feature_datasync_support            0
 %define tizen_feature_download_support            1
 %define tizen_feature_exif_support                1
index e071768723c7904cae622e306a12c08ae3d41546..44a06908099b9fea645cfc8e1fb8db88d5b97425 100755 (executable)
@@ -121,7 +121,7 @@ static bool SQLColumnValue(result_set_cursor cursor, int columnIndex,
   }
   switch (type) {
     case DATA_CONTROL_SQL_COLUMN_TYPE_INT64: {
-      int64_t data = 0;
+      long long data = 0;
       result = data_control_sql_get_int64_data(cursor, columnIndex, &data);
       if (result != DATA_CONTROL_ERROR_NONE) break;
       val = picojson::value(static_cast<double>(data));
@@ -322,7 +322,7 @@ static void SQLSelectResponseCallback(int requestId, data_control_h handle,
 }
 
 static void SQLInsertResponseCallback(int requestId, data_control_h handle,
-                                      int64_t inserted_row_id,
+                                      long long inserted_row_id,
                                       bool providerResult,
                                       const char *error, void *user_data) {
   LoggerD("Enter");
index 37ecfc203bdbe122a92757ccb31f83344309cfa2..bb935f225aed87f0eb5d44a8529ec21388d76782 100755 (executable)
@@ -97,7 +97,7 @@ void PowerManager::OnPlatformStateChangedCB(device_callback_e type, void* value,
     LoggerE("type is not DISPLAY_STATE");
     return;
   }
-  display_state_e state = static_cast<display_state_e>(reinterpret_cast<int>(value));
+  display_state_e state = static_cast<display_state_e>(reinterpret_cast<long long>(value));
   PowerState current = POWER_STATE_SCREEN_OFF;
   switch (state) {
     case DISPLAY_STATE_NORMAL :
index 18c97154a4057aee5feb275ad67a7d255fcf1667..8df07db5a42139450378b3847c491c6fa6de69fa 100644 (file)
@@ -302,7 +302,7 @@ void PushManager::onPushNotify(push_notification_h noti, void* user_data) {
     }
     free(temp);
 
-    int64_t date = -1;
+    long long int date = -1;
     ret = push_get_notification_time(noti, &date);
     if (ret != PUSH_ERROR_NONE) {
         LoggerE("Failed to get date");