summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorPatrick Luby <pluby@openoffice.org>2000-10-23 14:48:14 +0000
committerPatrick Luby <pluby@openoffice.org>2000-10-23 14:48:14 +0000
commit7610827793646427152922a5d16810f10eab2837 (patch)
tree583c809b1d9b35c8c817b3bc6b29c87b7ede65da /sal
parent0a20754caa995d831e1a3a89aef33570b5dc7786 (diff)
Removed #ifdefs for Mac OS X since they are no longer needed to compile.
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/unx/system.h17
1 files changed, 2 insertions, 15 deletions
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 699896abb0d6..038b92751b29 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -2,9 +2,9 @@
*
* $RCSfile: system.h,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 15:17:21 $
+ * last change: $Author: pluby $ $Date: 2000-10-23 15:48:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -418,29 +418,16 @@ extern unsigned int nanosleep(unsigned int);
#endif
#ifndef NORMALIZE_TIMESPEC
-# ifdef MACOSX
-# define NORMALIZE_TIMESPEC(timespec) \
- timespec.tv_sec += timespec.tv_nsec / 1000000000; \
- timespec.tv_nsec %= 1000000000;
-# else
# define NORMALIZE_TIMESPEC(timespec) \
timespec##.tv_sec += timespec##.tv_nsec / 1000000000; \
timespec##.tv_nsec %= 1000000000;
-# endif
#endif
#ifndef SET_TIMESPEC
-# ifdef MACOSX
-# define SET_TIMESPEC(timespec, sec, nsec) \
- timespec.tv_sec = (sec); \
- timespec.tv_nsec = (nsec); \
- NORMALIZE_TIMESPEC(timespec);
-# else
# define SET_TIMESPEC(timespec, sec, nsec) \
timespec##.tv_sec = (sec); \
timespec##.tv_nsec = (nsec); \
NORMALIZE_TIMESPEC(timespec);
-# endif
#endif
#ifndef SLEEP_TIMESPEC