Show
Ignore:
Timestamp:
08/01/08 14:47:24 (5 months ago)
Author:
sroret
Message:

merge with webkit revision 35510

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/BAL/OWBAL/Concretizations/Types/WK/BCTCSpinLockWK.h

    r426 r427  
    3838#include <time.h>       /* For nanosleep() */ 
    3939 
    40 #if PLATFORM(AMIGAOS4) 
    41 #include <unistd.h> 
    42 #else 
    4340#include <sched.h>      /* For sched_yield() */ 
    44 #endif 
    4541 
    4642#if HAVE(STDINT_H) 
     
    140136 
    141137static void TCMalloc_SlowLock(volatile unsigned int* lockword) { 
    142 #if !PLATFORM(AMIGAOS4) 
    143138  sched_yield();        // Yield immediately since fast path failed 
    144 #endif 
    145139  while (true) { 
    146140    int r; 
     
    188182#if PLATFORM(WIN_OS) 
    189183    Sleep(2); 
    190 #elif PLATFORM(AMIGAOS4) 
    191     usleep(200); 
    192184#else 
    193185    struct timespec tm;