diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-08 19:09:41 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-11 17:17:32 +0000 |
| commit | 949aa238981e6cedfc6d3f12fc9001a71162c6f3 (patch) | |
| tree | fb3c65fa385ede94bf30e5390bf35b83f7b9b66f | |
| parent | 2c805883408339823d3f3ca23aceb08a1783ebbd (diff) | |
| download | system_core-949aa238981e6cedfc6d3f12fc9001a71162c6f3.zip system_core-949aa238981e6cedfc6d3f12fc9001a71162c6f3.tar.gz system_core-949aa238981e6cedfc6d3f12fc9001a71162c6f3.tar.bz2 | |
Fix some clang compilation issues.
Use expected inline behavior with clang.
GCC defaults to -std=gnu90, giving C89 inline semantics with GNU
extensions. Clang defaults to C99. Explicitly use gnu90.
Mark an unused parameter as __unused.
Fix some incorrect casts.
Change-Id: I05b95585d5e3688eda71769b63b6b8a9237bcaf4
| -rw-r--r-- | fastbootd/vendor_trigger_default.c | 2 | ||||
| -rw-r--r-- | libcutils/Android.mk | 2 | ||||
| -rw-r--r-- | libpixelflinger/codeflinger/CodeCache.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fastbootd/vendor_trigger_default.c b/fastbootd/vendor_trigger_default.c index 3627024..0bcc99b 100644 --- a/fastbootd/vendor_trigger_default.c +++ b/fastbootd/vendor_trigger_default.c @@ -52,7 +52,7 @@ int trigger_gpt_layout(struct GPT_content *table) { return 0; } -int trigger_oem_cmd(const char *arg, const char **response) { +int trigger_oem_cmd(const char *arg, const char **response __unused) { KLOG_DEBUG("fastbootd", "%s: %s", __func__, arg); return 0; } diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 12a3bf9..5a4be93 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -151,7 +151,7 @@ LOCAL_CFLAGS_x86_64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32 LOCAL_C_INCLUDES := $(libcutils_c_includes) LOCAL_STATIC_LIBRARIES := liblog -LOCAL_CFLAGS += $(targetSmpFlag) -Werror +LOCAL_CFLAGS += $(targetSmpFlag) -Werror -std=gnu90 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_LIBRARY) diff --git a/libpixelflinger/codeflinger/CodeCache.cpp b/libpixelflinger/codeflinger/CodeCache.cpp index cfd2b37..d770302 100644 --- a/libpixelflinger/codeflinger/CodeCache.cpp +++ b/libpixelflinger/codeflinger/CodeCache.cpp @@ -201,8 +201,8 @@ int CodeCache::cache( const AssemblyKeyBase& keyBase, mCacheInUse += assemblySize; mWhen++; // synchronize caches... - void* base = assembly->base(); - void* curr = (uint8_t*)base + assembly->size(); + char* base = reinterpret_cast<char*>(assembly->base()); + char* curr = reinterpret_cast<char*>(base + assembly->size()); __builtin___clear_cache(base, curr); } |