am 101a6987: am 5d40527a: Merge "libc: fix __cxa_atexit implicit declaration"

* commit '101a6987c1e3ebfabefb1692ada492b7c0da43ee':
  libc: fix __cxa_atexit implicit declaration
This commit is contained in:
Elliott Hughes 2013-10-07 11:36:40 -07:00 committed by Android Git Automerger
commit 5be92401e9

View File

@ -26,10 +26,11 @@
* SUCH DAMAGE.
*/
extern void *__dso_handle;
extern void* __dso_handle;
extern int __cxa_atexit(void (*)(void*), void*, void*);
__attribute__ ((visibility ("hidden")))
int atexit(void (*func)(void))
{
return (__cxa_atexit((void (*)(void *))func, (void *)0, &__dso_handle));
int atexit(void (*func)(void)) {
return (__cxa_atexit((void (*)(void*)) func, (void*) 0, &__dso_handle));
}