summaryrefslogtreecommitdiff
path: root/misc.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 /misc.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 'misc.c')
-rw-r--r--misc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/misc.c b/misc.c
index 49c53cd..35e61a2 100644
--- a/misc.c
+++ b/misc.c
@@ -845,7 +845,7 @@ GC_API void GC_CALL GC_init(void)
/* Convince lint that some things are used */
# ifdef LINT
{
- extern char * GC_copyright[];
+ extern char * const GC_copyright[];
GC_noop(GC_copyright, GC_find_header,
GC_push_one, GC_call_with_alloc_lock, GC_read,
GC_dont_expand,
@@ -1028,7 +1028,6 @@ out:
STATIC FILE * GC_stdout = NULL;
STATIC FILE * GC_stderr = NULL;
STATIC FILE * GC_log = NULL;
-static int GC_tmp; /* Should really be local ... */
STATIC void GC_set_files(void)
{
@@ -1102,9 +1101,10 @@ STATIC int GC_write(int fd, const char *buf, size_t len)
# define WRITE(f, buf, len) GC_write(buf, len)
#else
# if defined(OS2) || defined(MACOS)
+ static int fwrite_gc_res; /* Should really be local ... */
# define WRITE(f, buf, len) (GC_set_files(), \
- GC_tmp = fwrite((buf), 1, (len), (f)), \
- fflush(f), GC_tmp)
+ fwrite_gc_res = fwrite((buf), 1, (len), (f)), \
+ fflush(f), fwrite_gc_res)
# else
# define WRITE(f, buf, len) GC_write((f), (buf), (len))
# endif