diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-05-05 05:50:41 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-05-05 05:50:41 +0000 |
| commit | 875893b846a11908de51ed12ebcffb837115fdcd (patch) | |
| tree | 71bbd44bb76cf7abada813fccad5df3a5fe593ac | |
| parent | d1e38e8788873df130a07690c809803cfcab8bdd (diff) | |
| download | nginx-875893b846a11908de51ed12ebcffb837115fdcd.tar.gz nginx-875893b846a11908de51ed12ebcffb837115fdcd.tar.bz2 | |
fix building by owc12
| -rw-r--r-- | src/os/win32/ngx_atomic.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/os/win32/ngx_atomic.h b/src/os/win32/ngx_atomic.h index 5e32f1f33..dc761a896 100644 --- a/src/os/win32/ngx_atomic.h +++ b/src/os/win32/ngx_atomic.h @@ -45,7 +45,13 @@ typedef volatile ngx_atomic_uint_t ngx_atomic_t; #define ngx_memory_barrier() -#ifdef __BORLANDC__ +#if defined( __BORLANDC__ ) || ( __WATCOMC__ < 1230 ) + +/* + * Borland C++ 5.5 (tasm32) and Open Watcom C prior to 1.3 + * do not understand the "pause" instruction + */ + #define ngx_cpu_pause() #else #define ngx_cpu_pause() __asm { pause } |