summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-11-01 16:14:49 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-11-01 16:14:49 +0000
commit798c0c11b501683070185aebc69005ed11396858 (patch)
tree87810ec6f9b8f1469a9485762b6cdb38d63c0016
parent33801d3655c6e4b0a72986db50e8ab7157055dcd (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.
-rw-r--r--sal/inc/rtl/uuid.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/sal/inc/rtl/uuid.h b/sal/inc/rtl/uuid.h
index 476ee2b5a..989bd7529 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