Merge changes I0286459f,I9450743e,Ibf1efea5,I48325500,I2bd36929, ... into mnc-dev am: be4965a142 am: 1510bd88c2 am: b65042cea0 am: 8f3b11f74f am: 26afb21ae6 am: 60df077e94 am: 689c07f103 am: 358689af5f
am: 8a93fed229
Change-Id: I2d34c75c8162724209f7499237ea29843c67096e
diff --git a/Android.mk b/Android.mk
index f35448f..c1ae8bb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -87,7 +87,7 @@
LOCAL_SRC_FILES := $(common_SRC_FILES)
LOCAL_C_INCLUDES += $(common_C_INCLUDES)
LOCAL_CFLAGS += $(common_CFLAGS) -fvisibility=hidden
-LOCAL_SHARED_LIBRARIES += libicuuc-host
+LOCAL_SHARED_LIBRARIES += libicuuc
LOCAL_MODULE := libxml2
LOCAL_CLANG := true
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
diff --git a/timsort.h b/timsort.h
index 795f272..443918a 100644
--- a/timsort.h
+++ b/timsort.h
@@ -323,7 +323,7 @@
SORT_TYPE *tempstore = (SORT_TYPE *)realloc(store->storage, new_size * sizeof(SORT_TYPE));
if (tempstore == NULL)
{
- fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
+ fprintf(stderr, "Error allocating temporary storage for tim sort: need %zu bytes", sizeof(SORT_TYPE) * new_size);
exit(1);
}
store->storage = tempstore;