From 1a22ba18104caec504718967ae07d143873f6848 Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Tue, 12 May 2009 08:21:12 +0000 Subject: [PATCH] 1.0.28.40: hopefully fix Win32 build * Broken by 1.0.28.37. --- src/runtime/interrupt.c | 2 ++ src/runtime/thread.h | 2 +- version.lisp-expr | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index 4765645..13ff61d 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -102,6 +102,7 @@ union interrupt_handler interrupt_handlers[NSIG]; * work for SIGSEGV and similar. It is good enough for timers, and * maybe all deferrables. */ +#ifdef LISP_FEATURE_SB_THREAD static void add_handled_signals(sigset_t *sigset) { @@ -115,6 +116,7 @@ add_handled_signals(sigset_t *sigset) } void block_signals(sigset_t *what, sigset_t *where, sigset_t *old); +#endif static boolean maybe_resignal_to_lisp_thread(int signal, os_context_t *context) diff --git a/src/runtime/thread.h b/src/runtime/thread.h index dbca3db..510eadc 100644 --- a/src/runtime/thread.h +++ b/src/runtime/thread.h @@ -54,6 +54,7 @@ wait_for_thread_state_change(struct thread *thread, lispobj state) pthread_mutex_unlock(thread->state_lock); } +extern pthread_key_t lisp_thread; #endif extern int kill_safely(os_thread_t os_thread, int signal); @@ -69,7 +70,6 @@ union per_thread_data { extern struct thread *all_threads; extern int dynamic_values_bytes; -extern pthread_key_t lisp_thread; #if defined(LISP_FEATURE_DARWIN) #define CONTROL_STACK_ALIGNMENT_BYTES 8192 /* darwin wants page-aligned stacks */ diff --git a/version.lisp-expr b/version.lisp-expr index 6d17690..2f60e45 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.28.39" +"1.0.28.40" -- 1.7.10.4