diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-28 16:13:35 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-28 16:13:35 +0000 |
| commit | 72691b531b3f16c0ff10b9ee8c26f8da7dc29e08 (patch) | |
| tree | 4c31f0696967ed681f5b0ed56106d3f090140db2 /sal | |
| parent | 81758b86ee54e8ea941753a3fc77791d603493ee (diff) | |
INTEGRATION: CWS ooo20030412 (1.14.8.1.34); FILE MERGED
2003/04/28 13:08:52 mh 1.14.8.1.34.3: RESYNC: (1.15-1.16); FILE MERGED
2003/04/11 14:46:25 mh 1.14.8.1.34.2: chg: one more cpp warning, #i13256#
2003/04/11 10:15:02 mh 1.14.8.1.34.1: fix: no concatenation needed here
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/system.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h index 34e06ce8f6df..ff970afd831e 100644 --- a/sal/osl/unx/system.h +++ b/sal/osl/unx/system.h @@ -2,9 +2,9 @@ * * $RCSfile: system.h,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: vg $ $Date: 2003-04-11 14:24:13 $ + * last change: $Author: hr $ $Date: 2003-04-28 17:13:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -257,7 +257,7 @@ extern struct ps_strings *__ps_strings; # define NO_PTHREAD_PRIORITY extern int pthread_cancel(pthread_t); extern unsigned int nanosleep(unsigned int); -# define SLEEP_TIMESPEC(timespec) (timespec##.tv_sec > 0) ? sleep(timespec##.tv_sec), nanosleep(timespec##.tv_nsec) : nanosleep(timespec##.tv_nsec) +# define SLEEP_TIMESPEC(timespec) (timespec .tv_sec > 0) ? sleep(timespec .tv_sec), nanosleep(timespec .tv_nsec) : nanosleep(timespec .tv_nsec) # define PATH_MAX _POSIX_PATH_MAX # define S_ISSOCK S_ISFIFO # define PTHREAD_SIGACTION pthread_sigaction @@ -447,14 +447,14 @@ char *macxp_tempnam( const char *tmpdir, const char *prefix ); #ifndef NORMALIZE_TIMESPEC # define NORMALIZE_TIMESPEC(timespec) \ - timespec##.tv_sec += timespec##.tv_nsec / 1000000000; \ - timespec##.tv_nsec %= 1000000000; + timespec . tv_sec += timespec . tv_nsec / 1000000000; \ + timespec . tv_nsec %= 1000000000; #endif #ifndef SET_TIMESPEC # define SET_TIMESPEC(timespec, sec, nsec) \ - timespec##.tv_sec = (sec); \ - timespec##.tv_nsec = (nsec); \ + timespec . tv_sec = (sec); \ + timespec . tv_nsec = (nsec); \ NORMALIZE_TIMESPEC(timespec); #endif |