From fa0352284691a4c3c99ebdf5e04116dfe93fc0b7 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Sat, 2 Feb 2019 18:09:28 -0500
Subject: [PATCH] libroot: Revert changes to hide BeOS-only functions.

I wasn't thinking correctly when I made the previous change --
init_term_dyn is compiled into all applications, and so these
functions need to remain in order to not break them.
---
 src/system/libroot/libroot_init.c | 15 +++++++--------
 src/system/libroot/os/image.cpp   |  3 +--
 2 files changed, 8 insertions(+), 10 deletions(-)

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
+