diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-10-17 13:26:13 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-10-17 13:26:13 +0000 |
| commit | e332db1999aa7f20884b3b4ee40f77dc484bbcb4 (patch) | |
| tree | 6209658b3390846daa9014be343e8a0d458d8bad /sal | |
| parent | e333f5f61b6aa4ff6abc800af35dd59db6d6a17a (diff) | |
INTEGRATION: CWS macosxgcc4 (1.24.76); FILE MERGED
2005/09/20 03:40:34 fheckl 1.24.76.2: RESYNC: (1.24-1.25); FILE MERGED
2005/09/19 19:39:21 fheckl 1.24.76.1: Adding some casts necessary for compilation to succeed with gcc4 on MacOSX (i49046)
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/system.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h index 9374a4ec9ed1..10e8e784bbc4 100644 --- a/sal/osl/unx/system.h +++ b/sal/osl/unx/system.h @@ -4,9 +4,9 @@ * * $RCSfile: system.h,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: rt $ $Date: 2005-09-08 15:02:09 $ + * last change: $Author: rt $ $Date: 2005-10-17 14:26:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -424,7 +424,9 @@ void macxp_getSystemVersion( unsigned int *isDarwin, unsigned int *majorVersion, # define PTHREAD_VALUE(t) (t) #endif #ifndef PTHREAD_NONE +# if (__GNUC__ < 4) && !defined(MACOSX) extern pthread_t _pthread_none_; +# endif # define PTHREAD_NONE _pthread_none_ # ifndef PTHREAD_NONE_INIT # define PTHREAD_NONE_INIT ((pthread_t)-1) |