OSDN Git Service

Merge "Do not include assert.h in places where it may shadow the definition provided...
authorCarl Shapiro <cshapiro@google.com>
Fri, 12 Feb 2010 19:07:52 +0000 (11:07 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 12 Feb 2010 19:07:52 +0000 (11:07 -0800)
commit7b4781a3425d15498c12b1ae1972515f56543495
tree42d6d4b043949f5773c42228fe51c829ab23e9cf
parente44b9960af9ff6514c15048956e31ff76a5b6476
parent8eab1c515ef7f6bdb0252d49e6ea1c8ca7d8cfed
Merge "Do not include assert.h in places where it may shadow the definition provided by Common.h if WITH_DALVIK_ASSERTS is defined.  The include from HeapBitmap.h was notable as it redefined the Dalvik friendly assert macro with the useless libc macro across all of the GC sources." into dalvik-dev