diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NT_STATIC_THREADS_MAKEFILE | 6 | ||||
| -rw-r--r-- | include/private/thread_local_alloc.h | 2 | ||||
| -rw-r--r-- | thread_local_alloc.c | 3 |
4 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2007-05-08 Hans Boehm <Hans.Boehm@hp.com> + + * thread_local_alloc.c, include/private/thread_local_alloc.h: + Spell __declspec correctly. + * NT_STATIC_THREADS_MAKEFILE: Enable thread-local allocation. + 2007-05-07 Hans Boehm <Hans.Boehm@hp.com> * doc/README.win32: Adjust GC_win32_dll_threads rules again. diff --git a/NT_STATIC_THREADS_MAKEFILE b/NT_STATIC_THREADS_MAKEFILE index ef05f0f6..b52ed673 100644 --- a/NT_STATIC_THREADS_MAKEFILE +++ b/NT_STATIC_THREADS_MAKEFILE @@ -14,15 +14,15 @@ AO_VERSION=1.2 AO_SRC_DIR=libatomic_ops-$(AO_VERSION)/src AO_INCLUDE_DIR=$(AO_SRC_DIR) -OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj msvc_dbg.obj +OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj msvc_dbg.obj thread_local_alloc.obj all: gctest.exe cord\de.exe test_cpp.exe .c.obj: - $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -D__STDC__ -DGC_NOT_DLL -DGC_WIN32_THREADS $*.c /Fo$*.obj + $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -D__STDC__ -DGC_NOT_DLL -DGC_WIN32_THREADS -DTHREAD_LOCAL_ALLOC $*.c /Fo$*.obj .cpp.obj: - $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL $*.CPP -DGC_WIN32_THREADS /Fo$*.obj + $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL $*.CPP -DGC_WIN32_THREADS -DTHREAD_LOCAL_ALLOC /Fo$*.obj $(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h include\private\msvc_dbg.h diff --git a/include/private/thread_local_alloc.h b/include/private/thread_local_alloc.h index 2b11a1c7..2efae378 100644 --- a/include/private/thread_local_alloc.h +++ b/include/private/thread_local_alloc.h @@ -139,7 +139,7 @@ extern #if defined(USE_COMPILER_TLS) __thread #elif defined(USE_WIN32_COMPILER_TLS) - declspec(thread) + __declspec(thread) #endif GC_key_t GC_thread_key; diff --git a/thread_local_alloc.c b/thread_local_alloc.c index 40491cb1..cfdb6d76 100644 --- a/thread_local_alloc.c +++ b/thread_local_alloc.c @@ -22,7 +22,7 @@ #if defined(USE_COMPILER_TLS) __thread #elif defined(USE_WIN32_COMPILER_TLS) - declspec(thread) + __declspec(thread) #endif GC_key_t GC_thread_key; @@ -53,7 +53,6 @@ static void return_single_freelist(void *fl, void **gfl) static void return_freelists(void **fl, void **gfl) { int i; - void *q, **qptr; for (i = 1; i < TINY_FREELISTS; ++i) { if ((word)(fl[i]) >= HBLKSIZE) { |