commit 14b91a829a9795e701b4f15cabc2770c40279bd5
author Jason Sams <rjsams@android.com> Fri Sep 03 11:48:52 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 03 11:48:52 2010 -0700
tree 2e487e46912d31044fb927f38d3f134e40ec2ba3
parent dad578642b5c2410e4bd35beb972cdb3a23a7292
parent 54adc5e8a1a4b43c67b8ae657453b5009e981b47

Merge "Remove ACC which has been replaced with llvm. Free up space in build."

include/arch/windows/AndroidConfig.h

diff --git a/include/arch/windows/AndroidConfig.h b/include/arch/windows/AndroidConfig.h
index 806887b..bb8e5ef 100644
--- a/include/arch/windows/AndroidConfig.h
+++ b/include/arch/windows/AndroidConfig.h
@@ -311,7 +311,7 @@
 /*
  * Define if <stdbool.h> exists.
  */
-/* #define HAVE_STDBOOL_H */
+#define HAVE_STDBOOL_H
 
 /*
  * Define if <sched.h> exists.

include/private/android_filesystem_config.h

diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 57d6761..126ba70 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -76,7 +76,7 @@
     unsigned aid;
 };
 
-static struct android_id_info android_ids[] = {
+static const struct android_id_info android_ids[] = {
     { "root",      AID_ROOT, },
     { "system",    AID_SYSTEM, },
     { "radio",     AID_RADIO, },