summaryrefslogtreecommitdiffstats
path: root/libc/stdlib
diff options
context:
space:
mode:
authorDavid Turner <digit@android.com>2011-06-23 05:28:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-23 05:28:13 -0700
commitb489666086265eb756f11fd224137c7e3a03a707 (patch)
treef6eaf3b51b9edc6e81033ee4b5d089815a25ba20 /libc/stdlib
parentd0909a874a0b4e2de1468021942c75712a4463fa (diff)
parent1c0a0381dfb3648ffadef9537ec9383d63d62473 (diff)
downloadbionic-b489666086265eb756f11fd224137c7e3a03a707.zip
bionic-b489666086265eb756f11fd224137c7e3a03a707.tar.gz
bionic-b489666086265eb756f11fd224137c7e3a03a707.tar.bz2
am 1c0a0381: Merge "Enable functional DSO object destruction"
* commit '1c0a0381dfb3648ffadef9537ec9383d63d62473': Enable functional DSO object destruction
Diffstat (limited to 'libc/stdlib')
-rw-r--r--libc/stdlib/atexit.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libc/stdlib/atexit.c b/libc/stdlib/atexit.c
index 4ba2177..f4bcab9 100644
--- a/libc/stdlib/atexit.c
+++ b/libc/stdlib/atexit.c
@@ -104,6 +104,7 @@ unlock:
return (ret);
}
+#ifdef CRT_LEGACY_WORKAROUND
/*
* Register a function to be performed at exit.
*/
@@ -112,6 +113,7 @@ atexit(void (*func)(void))
{
return (__cxa_atexit((void (*)(void *))func, NULL, NULL));
}
+#endif
/*
* Call all handlers registered with __cxa_atexit() for the shared