summaryrefslogtreecommitdiff
path: root/dyn_load.c
diff options
context:
space:
mode:
authorivmai <ivmai>2009-10-17 13:18:17 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:50 +0200
commit340c70374894e651e9ed32adcdebfb3e3fa2c69c (patch)
tree832c3efdaca9a2607806ced5b474bca5064942af /dyn_load.c
parent8274f8d1e2e748fba76be6ddf2d09c105e7af778 (diff)
2009-10-17 Ivan Maidanski <ivmai@mail.ru>
* alloc.c (GC_copyright): Define as const. * alloc.c (GC_collect_at_heapsize): Replace "static" with "STATIC" (since the name starts with "GC_" prefix). * dbg_mlc.c (GC_describe_type_fns): Ditto. * dyn_load.c (GC_FirstDLOpenedLinkMap, GC_register_dynlib_callback, GC_dyld_sections, GC_dyld_name_for_hdr, GC_dyld_image_add, GC_dyld_image_remove): Ditto. * malloc.c (GC_libpthread_start, GC_libpthread_end, GC_libld_start, GC_libld_end): Ditto. * mark_rts.c (GC_remove_root_at_pos, GC_rebuild_root_index): Ditto. * os_dep.c (GC_gww_read_dirty, GC_gww_page_was_dirty, GC_gww_page_was_ever_dirty, GC_mprotect_thread_notify, GC_mprotect_thread_reply, GC_mprotect_thread, GC_darwin_sigbus, GC_forward_exception): Ditto. * pthread_support.c (GC_syms_initialized): Ditto. * typd_mlc.c (GC_push_typed_structures_proc): Ditto. * win32_threads.c (GC_win32_dll_threads, GC_register_my_thread_inner, GC_lookup_pthread, GC_get_stack_min, GC_waitForSingleObjectInfinite): Ditto. * darwin_stop_world.c (GC_use_mach_handler_thread, GC_use_mach_handler_thread, GC_mach_threads_count): Replace "static" with "STATIC" and add zero initializer. * os_dep.c (GC_task_self, GC_ports, GC_mprotect_state, GC_sigbus_count): Ditto. * headers.c (free_hdr): Replace "static" with GC_INLINE. * misc.c (GC_tmp): Rename static variable to fwrite_gc_res. * os_dep.c (memory): Rename static variable to ecos_gc_memory. * os_dep.c (async_set_pht_entry_from_index): Make static (for MPROTECT_VDB case). * pthread_support.c (GC_real_pthread_create, GC_real_pthread_sigmask, GC_real_pthread_join, GC_real_pthread_detach, GC_init_real_syms): Use REAL_FUNC() macro for static GC_real_XXX symbols. * win32_threads.c (GC_may_be_in_stack): Remove "GC_" prefix.
Diffstat (limited to 'dyn_load.c')
-rw-r--r--dyn_load.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/dyn_load.c b/dyn_load.c
index 93db044..469d9d1 100644
--- a/dyn_load.c
+++ b/dyn_load.c
@@ -122,7 +122,7 @@ STATIC GC_has_static_roots_func GC_has_static_roots = 0;
Elf32_Dyn _DYNAMIC;
#endif
-static struct link_map *
+STATIC struct link_map *
GC_FirstDLOpenedLinkMap(void)
{
extern ElfW(Dyn) _DYNAMIC;
@@ -420,8 +420,8 @@ static int n_load_segs;
# endif /* PT_GNU_RELRO */
-static int GC_register_dynlib_callback(struct dl_phdr_info * info,
- size_t size, void * ptr)
+STATIC int GC_register_dynlib_callback(struct dl_phdr_info * info,
+ size_t size, void * ptr)
{
const ElfW(Phdr) * p;
ptr_t start, end;
@@ -584,7 +584,7 @@ GC_bool GC_register_main_static_data(void)
#endif
extern ElfW(Dyn) _DYNAMIC[];
-static struct link_map *
+STATIC struct link_map *
GC_FirstDLOpenedLinkMap(void)
{
ElfW(Dyn) *dp;
@@ -1145,7 +1145,7 @@ void GC_register_dynamic_libraries(void)
/*#define DARWIN_DEBUG*/
-const static struct {
+STATIC const struct {
const char *seg;
const char *sect;
} GC_dyld_sections[] = {
@@ -1154,7 +1154,7 @@ const static struct {
{ SEG_DATA, SECT_COMMON }
};
-static const char *GC_dyld_name_for_hdr(const struct GC_MACH_HEADER *hdr)
+STATIC const char *GC_dyld_name_for_hdr(const struct GC_MACH_HEADER *hdr)
{
unsigned long i, c;
c = _dyld_image_count();
@@ -1165,7 +1165,7 @@ static const char *GC_dyld_name_for_hdr(const struct GC_MACH_HEADER *hdr)
}
/* This should never be called by a thread holding the lock */
-static void GC_dyld_image_add(const struct GC_MACH_HEADER *hdr, intptr_t slide)
+STATIC void GC_dyld_image_add(const struct GC_MACH_HEADER *hdr, intptr_t slide)
{
unsigned long start,end,i;
const struct GC_MACH_SECTION *sec;
@@ -1201,7 +1201,7 @@ static void GC_dyld_image_add(const struct GC_MACH_HEADER *hdr, intptr_t slide)
}
/* This should never be called by a thread holding the lock */
-static void GC_dyld_image_remove(const struct GC_MACH_HEADER *hdr,
+STATIC void GC_dyld_image_remove(const struct GC_MACH_HEADER *hdr,
intptr_t slide)
{
unsigned long start,end,i;