diff --git a/src/system/libroot/libroot_init.c b/src/system/libroot/libroot_init.c index ddffec08be..6da22d4bbd 100644 --- a/src/system/libroot/libroot_init.c +++ b/src/system/libroot/libroot_init.c @@ -82,13 +82,6 @@ initialize_before(image_id imageID) } -void -terminate_after(image_id id) -{ - __heap_terminate_after(); -} - -#ifdef _BEOS_R5_COMPATIBLE_ void _init_c_library_(void); void _init_c_library_(void) @@ -98,4 +91,10 @@ _init_c_library_(void) // Our libroot functions are already initialized above, so we don't have to // do anything here. } -#endif + + +void +terminate_after(image_id id) +{ + __heap_terminate_after(); +} diff --git a/src/system/libroot/os/image.cpp b/src/system/libroot/os/image.cpp index 664110bafb..8edba44348 100644 --- a/src/system/libroot/os/image.cpp +++ b/src/system/libroot/os/image.cpp @@ -489,7 +489,6 @@ __flatten_process_args(const char* const* args, int32 argCount, } -#ifdef _BEOS_R5_COMPATIBLE_ extern "C" void _call_init_routines_(void); void _call_init_routines_(void) @@ -497,4 +496,4 @@ _call_init_routines_(void) // This is called by the original BeOS startup code. // We don't need it, because our loader already does the job, right? } -#endif +