diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 16:14:49 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 16:14:49 +0000 |
commit | bbb88d2babaa94aa186d41ca4091ab0e2d13f167 (patch) | |
tree | 18e9812dd67362f3eb6e02f37ea78705d4485284 /sal/inc/rtl/uuid.h | |
parent | 92b865ee1ae318d00a0e8e8b4272bd675e0cb298 (diff) |
INTEGRATION: CWS pj85 (1.10.18); FILE MERGED
2007/10/13 18:48:58 pjanik 1.10.18.1: #i78467#: Remove old Mac code.
Diffstat (limited to 'sal/inc/rtl/uuid.h')
-rw-r--r-- | sal/inc/rtl/uuid.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sal/inc/rtl/uuid.h b/sal/inc/rtl/uuid.h index 749cb149d7a5..4a6e4fccfb8e 100644 --- a/sal/inc/rtl/uuid.h +++ b/sal/inc/rtl/uuid.h @@ -4,9 +4,9 @@ * * $RCSfile: uuid.h,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: vg $ $Date: 2007-09-20 15:07:32 $ + * last change: $Author: hr $ $Date: 2007-11-01 17:14:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -206,8 +206,6 @@ void SAL_CALL rtl_createNamedUuid( #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10 #elif MACOSX #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 100000 -#elif MACOS -#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 100000 #elif IRIX #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10 #else |