summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorShin-ichiro KAWASAKI <shinichiro.kawasaki.mg@hitachi.com>2009-07-03 16:37:46 +0900
committerTony Sim <sim.chinyeow@renesas.com>2009-07-03 16:37:46 +0900
commit56cfd6681aa4e5bb3088a283f10438dd6b746f98 (patch)
tree5545b66a09042b9eef08a22431e3da5f9aa6e05e /media
parent7ecccee0d0c32ee472c9a74f4ccb8b152b074402 (diff)
downloadframeworks_base-56cfd6681aa4e5bb3088a283f10438dd6b746f98.zip
frameworks_base-56cfd6681aa4e5bb3088a283f10438dd6b746f98.tar.gz
frameworks_base-56cfd6681aa4e5bb3088a283f10438dd6b746f98.tar.bz2
Modified libdrm to support SuperH platform
Added USTL_ANDROID_SH defination while build on SuperH platform
Diffstat (limited to 'media')
-rw-r--r--media/libdrm/mobile2/Android.mk4
-rw-r--r--media/libdrm/mobile2/src/util/ustl-1.0/uutility.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/media/libdrm/mobile2/Android.mk b/media/libdrm/mobile2/Android.mk
index e187139..70c6683 100644
--- a/media/libdrm/mobile2/Android.mk
+++ b/media/libdrm/mobile2/Android.mk
@@ -74,6 +74,10 @@ LOCAL_MODULE := libdrm2
ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86)
LOCAL_CFLAGS += -DUSTL_ANDROID_X86
+else
+ ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-sh)
+ LOCAL_CFLAGS += -DUSTL_ANDROID_SH
+ endif
endif
include $(BUILD_STATIC_LIBRARY)
diff --git a/media/libdrm/mobile2/src/util/ustl-1.0/uutility.h b/media/libdrm/mobile2/src/util/ustl-1.0/uutility.h
index 7b5ae64..2ee9a81 100644
--- a/media/libdrm/mobile2/src/util/ustl-1.0/uutility.h
+++ b/media/libdrm/mobile2/src/util/ustl-1.0/uutility.h
@@ -370,7 +370,7 @@ namespace simd {
/// implicit casts to pointer from an integral type. Ironically, such an
/// implicit cast is already detected by gcc.
///
-#if defined(USTL_ANDROID_X86)
+#if defined(USTL_ANDROID_X86) || defined(USTL_ANDROID_SH)
#define OVERLOAD_POINTER_AND_SIZE_T_V2(name, arg1type)
#else
#define OVERLOAD_POINTER_AND_SIZE_T_V2(name, arg1type) \