commit d69ec35bef0d3aa11bfb55501951eed8c3042fda
author David 'Digit' Turner <digit@google.com> Mon Oct 11 06:30:00 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 11 06:30:00 2010 -0700
tree d9489a12de76ab2236576c8de872f66236a69d44
parent 1aeeeae166920f871c1e4ecd960bb92dcaef0896
parent 1aa6708cc2b7792a647ada960a66a1e0146fb209

am 1aa6708c: Fix the build. Oops.

Merge commit '1aa6708cc2b7792a647ada960a66a1e0146fb209' into gingerbread-plus-aosp

* commit '1aa6708cc2b7792a647ada960a66a1e0146fb209':
  Fix the build. Oops.

libstdc++/include/cstdlib

diff --git a/libstdc++/include/cstdlib b/libstdc++/include/cstdlib
index e520543..bb6f5a5 100644
--- a/libstdc++/include/cstdlib
+++ b/libstdc++/include/cstdlib
@@ -42,7 +42,9 @@
 using ::exit;
 using ::abort;
 using ::atexit;
+#if 0 /* MISSING FROM BIONIC */
 using ::on_exit;
+#endif
 
 using ::getenv;
 using ::putenv;