diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2001-02-26 10:42:28 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2001-02-26 10:42:28 +0000 |
| commit | eda83dd6f23e2b3beb73a181153fd67d4a6a7476 (patch) | |
| tree | d61cdec4017f59affd6bf14157be8a3ea64af36e /sal/osl | |
| parent | 543e104cf7998419165f873a895c39de3beaafe6 (diff) | |
assembler implementations for SPARC/GCC and Solaris/X86
Diffstat (limited to 'sal/osl')
| -rw-r--r-- | sal/osl/unx/interlck.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sal/osl/unx/interlck.c b/sal/osl/unx/interlck.c index 4899f2071771..88662958a613 100644 --- a/sal/osl/unx/interlck.c +++ b/sal/osl/unx/interlck.c @@ -2,9 +2,9 @@ * * $RCSfile: interlck.c,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2001-02-23 19:25:55 $ + * last change: $Author: hr $ $Date: 2001-02-26 11:42:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,8 +65,10 @@ #include <osl/interlck.h> #include <osl/diagnose.h> -#if (defined ( __SUNPRO_C ) || defined ( __SUNPRO_CC )) && defined ( SPARC ) +#if defined ( SOLARIS) && defined ( SPARC ) #error please use asm/interlck_sparc.s +#elif defined ( SOLARIS) && defined ( X86 ) +#error please use asm/interlck_x86.s #elif defined ( GCC ) && defined ( X86 ) /*****************************************************************************/ @@ -100,8 +102,8 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* : "memory"); } -#elif -/* use only if nothinig else works, expensive due to single mutex for all reference counts */ +#else +/* use only if nothing else works, expensive due to single mutex for all reference counts */ static pthread_mutex_t InterLock = PTHREAD_MUTEX_INITIALIZER; @@ -133,4 +135,4 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* return (Count); } -#endif /* expensive default, works everywhere */ +#endif /* default */ |