From 454d418dec1eda78f7dedfebeec978a87d6ff773 Mon Sep 17 00:00:00 2001
From: ivmai <ivmai>
Date: Fri, 16 Oct 2009 06:41:03 +0000
Subject: [PATCH] 2009-10-16  Ivan Maidanski <ivmai@mail.ru>

	* alloc.c (GC_finish_collection): Replace getenv() with GETENV().
	* dyn_load.c (GC_init_dyld): Ditto.
	* os_dep.c (GC_print_callers): Ditto.
	* dyn_load.c (GC_dyld_name_for_hdr): Cast _dyld_get_image_name()
	result (since it's always of "struct mach_header" type).
	* dyn_load.c (GC_init_dyld): Cast GC_dyld_image_add and
	GC_dyld_image_remove (to always have the first argument of
	"struct mach_header" pointer type).
---
 ChangeLog  | 11 +++++++++++
 alloc.c    |  2 +-
 dyn_load.c | 38 +++++++++++++++++++-------------------
 os_dep.c   |  2 +-
 4 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bd63c4a9..60cd9776 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-16  Ivan Maidanski <ivmai@mail.ru>
+
+	* alloc.c (GC_finish_collection): Replace getenv() with GETENV().
+	* dyn_load.c (GC_init_dyld): Ditto.
+	* os_dep.c (GC_print_callers): Ditto.
+	* dyn_load.c (GC_dyld_name_for_hdr): Cast _dyld_get_image_name()
+	result (since it's always of "struct mach_header" type).
+	* dyn_load.c (GC_init_dyld): Cast GC_dyld_image_add and
+	GC_dyld_image_remove (to always have the first argument of
+	"struct mach_header" pointer type).
+
 2009-10-16  Ivan Maidanski <ivmai@mail.ru> (really Petter Urkedal)
 
 	* configure.ac: Add threads support for OpenBSD case (threads may
diff --git a/alloc.c b/alloc.c
index d5309ce7..8d4dbe03 100644
--- a/alloc.c
+++ b/alloc.c
@@ -782,7 +782,7 @@ STATIC void GC_finish_collection(void)
 
     GC_bytes_found = 0;
 #   if defined(LINUX) && defined(__ELF__) && !defined(SMALL_CONFIG)
-        if (getenv("GC_PRINT_ADDRESS_MAP") != 0) {
+        if (GETENV("GC_PRINT_ADDRESS_MAP") != 0) {
           GC_print_address_map();
         }
 #   endif
diff --git a/dyn_load.c b/dyn_load.c
index b4f733e2..498879af 100644
--- a/dyn_load.c
+++ b/dyn_load.c
@@ -1155,10 +1155,12 @@ const static struct {
         { SEG_DATA, SECT_COMMON }
 };
 
-static const char *GC_dyld_name_for_hdr(const struct GC_MACH_HEADER *hdr) {
-    unsigned long i,c;
+static const char *GC_dyld_name_for_hdr(const struct GC_MACH_HEADER *hdr)
+{
+    unsigned long i, c;
     c = _dyld_image_count();
-    for(i=0;i<c;i++) if(_dyld_get_image_header(i) == hdr)
+    for (i = 0; i < c; i++)
+      if ((const struct GC_MACH_HEADER *)_dyld_get_image_header(i) == hdr)
         return _dyld_get_image_name(i);
     return NULL;
 }
@@ -1235,7 +1237,6 @@ void GC_register_dynamic_libraries(void) {
 
 void GC_init_dyld(void) {
   static GC_bool initialized = FALSE;
-  char *bind_fully_env = NULL;
 
   if(initialized) return;
 
@@ -1244,29 +1245,28 @@ void GC_init_dyld(void) {
 #   endif
 
   /* Apple's Documentation:
-     When you call _dyld_register_func_for_add_image, the dynamic linker runtime
-     calls the specified callback (func) once for each of the images that is
-     currently loaded into the program. When a new image is added to the program,
-     your callback is called again with the mach_header for the new image, and the
-     virtual memory slide amount of the new image.
+     When you call _dyld_register_func_for_add_image, the dynamic linker
+     runtime calls the specified callback (func) once for each of the images
+     that is currently loaded into the program. When a new image is added to
+     the program, your callback is called again with the mach_header for the
+     new image, and the virtual memory slide amount of the new image.
 
      This WILL properly register already linked libraries and libraries
-     linked in the future
+     linked in the future.
   */
 
-    _dyld_register_func_for_add_image(GC_dyld_image_add);
-    _dyld_register_func_for_remove_image(GC_dyld_image_remove);
+    _dyld_register_func_for_add_image(
+              (void (*)(struct mach_header *, intptr_t))GC_dyld_image_add);
+    _dyld_register_func_for_remove_image(
+              (void (*)(struct mach_header *, intptr_t))GC_dyld_image_remove);
 
     /* Set this early to avoid reentrancy issues. */
     initialized = TRUE;
 
-    bind_fully_env = getenv("DYLD_BIND_AT_LAUNCH");
-
-    if (bind_fully_env == NULL) {
-#   ifdef DARWIN_DEBUG
-      GC_printf("Forcing full bind of GC code...\n");
-#   endif
-
+    if (GETENV("DYLD_BIND_AT_LAUNCH") == 0) {
+#     ifdef DARWIN_DEBUG
+        GC_printf("Forcing full bind of GC code...\n");
+#     endif
       if(!_dyld_bind_fully_image_containing_address((unsigned long*)GC_malloc))
         ABORT("_dyld_bind_fully_image_containing_address failed");
     }
diff --git a/os_dep.c b/os_dep.c
index db049ed6..7e27dff6 100644
--- a/os_dep.c
+++ b/os_dep.c
@@ -4273,7 +4273,7 @@ void GC_print_callers (struct callinfo info[NFRAMES])
                 /* isn't time critical.                                 */
                 sprintf(cmd_buf, "/usr/bin/addr2line -f -e %s 0x%lx", exe_name,
                                  (unsigned long)info[i].ci_pc);
-                old_preload = getenv ("LD_PRELOAD");
+                old_preload = GETENV("LD_PRELOAD");
                 if (0 != old_preload) {
                   if (strlen (old_preload) >= PRELOAD_SZ) {
                     will_fail = TRUE;
-- 
2.40.0