[haiku-commits] haiku: hrev52833 - headers/os/kernel src/system/libroot/os src/system/libroot

  • From: waddlesplash <waddlesplash@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 2 Feb 2019 18:13:55 -0500 (EST)

hrev52833 adds 2 changesets to branch 'master'
old head: 89b57687312450f6d40255dacce68993a587a990
new head: 3493fcb668b090f975b6f7d7aa8ac35069107991
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=3493fcb668b0+%5E89b576873124

----------------------------------------------------------------------------

fa0352284691: 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.

3493fcb668b0: headers/kernel: Add argument names to initialization functions.

                              [ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]

----------------------------------------------------------------------------

3 files changed, 12 insertions(+), 14 deletions(-)
headers/os/kernel/image.h         |  8 ++++----
src/system/libroot/libroot_init.c | 15 +++++++--------
src/system/libroot/os/image.cpp   |  3 +--

############################################################################

Commit:      fa0352284691a4c3c99ebdf5e04116dfe93fc0b7
URL:         https://git.haiku-os.org/haiku/commit/?id=fa0352284691
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Sat Feb  2 23:09:28 2019 UTC

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.

----------------------------------------------------------------------------

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
+

############################################################################

Revision:    hrev52833
Commit:      3493fcb668b090f975b6f7d7aa8ac35069107991
URL:         https://git.haiku-os.org/haiku/commit/?id=3493fcb668b0
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Sat Feb  2 23:10:54 2019 UTC

headers/kernel: Add argument names to initialization functions.

----------------------------------------------------------------------------

diff --git a/headers/os/kernel/image.h b/headers/os/kernel/image.h
index 69a29b4899..e7810ef428 100644
--- a/headers/os/kernel/image.h
+++ b/headers/os/kernel/image.h
@@ -64,10 +64,10 @@ extern "C" {
 #define B_TERM_BEFORE_FUNCTION_NAME    "terminate_before"
 #define B_TERM_AFTER_FUNCTION_NAME     "terminate_after"
 
-void initialize_before(image_id);
-void initialize_after(image_id);
-void terminate_before(image_id);
-void terminate_after(image_id);
+void initialize_before(image_id self);
+void initialize_after(image_id self);
+void terminate_before(image_id self);
+void terminate_after(image_id self);
 
 
 #define B_APP_IMAGE_SYMBOL             ((void*)(addr_t)0)


Other related posts:

  • » [haiku-commits] haiku: hrev52833 - headers/os/kernel src/system/libroot/os src/system/libroot - waddlesplash