From: Nikodemus Siivola Date: Sat, 12 Nov 2011 13:09:41 +0000 (+0200) Subject: clean leftover SB_LUTEX gunk from the runtime X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=79578c137282cc8fa8eb34112915dc17a3855224;p=sbcl.git clean leftover SB_LUTEX gunk from the runtime Missed a spot... --- diff --git a/src/runtime/bsd-os.c b/src/runtime/bsd-os.c index f8682e2..3f54aef 100644 --- a/src/runtime/bsd-os.c +++ b/src/runtime/bsd-os.c @@ -383,8 +383,8 @@ static void freebsd_init() #endif /* LISP_FEATURE_X86 */ } -#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX) \ - && !defined(LISP_FEATURE_SB_LUTEX) +#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_FUTEX) \ + && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX) int futex_wait(int *lock_word, long oldval, long sec, unsigned long usec) { diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c index e262f41..151aea0 100644 --- a/src/runtime/linux-os.c +++ b/src/runtime/linux-os.c @@ -64,7 +64,7 @@ int personality (unsigned long); size_t os_vm_page_size; -#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_LUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX) +#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_FUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX) #include #include #include @@ -221,7 +221,7 @@ os_init(char *argv[], char *envp[]) #endif } #ifdef LISP_FEATURE_SB_THREAD -#if !defined(LISP_FEATURE_SB_LUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX) +#if defined(LISP_FEATURE_SB_FUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX) futex_init(); #endif if(! isnptl()) {