From 09ef42d3aca1d2e19cd08c083e8f94ff05ed8430 Mon Sep 17 00:00:00 2001 From: brodsom Date: Tue, 4 Mar 2003 00:38:31 +0000 Subject: [PATCH] Add condition to ifdef --- src/lock/lock.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lock/lock.cpp b/src/lock/lock.cpp index b9d50a7ef4..01b68c9184 100644 --- a/src/lock/lock.cpp +++ b/src/lock/lock.cpp @@ -29,7 +29,7 @@ * */ /* -$Id: lock.cpp,v 1.37 2003-03-04 00:04:33 brodsom Exp $ +$Id: lock.cpp,v 1.38 2003-03-04 00:38:31 brodsom Exp $ */ #include "firebird.h" @@ -198,7 +198,8 @@ static LBL alloc_lock(USHORT, STATUS *); #ifdef STATIC_SEMAPHORES static USHORT alloc_semaphore(OWN, STATUS *); #endif -#if !(defined WIN_NT || defined SOLARIS_MT || POSIX_THREADS) +#if (!(defined WIN_NT || defined SOLARIS_MT || POSIX_THREADS)) \ +|| (defined SOLARIS_MT && !defined SUPERSERVER) || (defined WIN_NT && !defined SUPERSERVER) static void blocking_action(PTR); #endif static void blocking_action2(PTR, PTR); @@ -1744,7 +1745,8 @@ static USHORT alloc_semaphore( OWN owner, STATUS * status_vector) #endif -#if !(defined WIN_NT || defined SOLARIS_MT || POSIX_THREADS) +#if (!(defined WIN_NT || defined SOLARIS_MT || POSIX_THREADS)) \ +|| (defined SOLARIS_MT && !defined SUPERSERVER) || (defined WIN_NT && !defined SUPERSERVER) static void blocking_action( PTR owner_offset) { /**************************************