diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 08:43:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 08:43:46 +0000 |
| commit | 25e8e3f2476bb87d9ddb59408f1e2b05510fe07a (patch) | |
| tree | 7c8b8f739cb56e1c4bbc6f205b0dcfe3358ebb6b /sal/osl/unx/util.c | |
| parent | 913b1ae8d48362e2e4bfb658804400859ffbb4a6 (diff) | |
INTEGRATION: CWS tune03 (1.6.52); FILE MERGED
2004/05/25 16:57:41 hr 1.6.52.1: #i29488#: remove osl_InterlockedCountSetV9() and osl_InitSparcV9() for SPARC v8plus architecture
Diffstat (limited to 'sal/osl/unx/util.c')
| -rw-r--r-- | sal/osl/unx/util.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c index 7b684bbb7988..56e4cb16c409 100644 --- a/sal/osl/unx/util.c +++ b/sal/osl/unx/util.c @@ -2,9 +2,9 @@ * * $RCSfile: util.c,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2004-02-03 13:24:24 $ + * last change: $Author: rt $ $Date: 2004-08-23 09:43:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -326,7 +326,9 @@ static char* osl_decodeEtherAddr(const char *ptr, char* buff) return(buff); } -#if defined ( SOLARIS ) && defined ( SPARC ) +#if defined (SPARC) + +#if defined (SOLARIS) && !defined(__sparcv8plus) && !defined(__sparcv9) #include <sys/types.h> #include <sys/processor.h> @@ -371,9 +373,9 @@ void osl_InitSparcV9(void) } } -#endif +#endif /* SOLARIS */ -#if defined(NETBSD) && defined(SPARC) && defined(GCC) +#if defined(NETBSD) && defined(GCC) && !defined(__sparcv9) && !defined(__sparc_v9__) #include <sys/param.h> #include <sys/sysctl.h> @@ -397,5 +399,7 @@ void osl_InitSparcV9(void) } } -#endif +#endif /* NETBSD */ + +#endif /* SPARC */ |