diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-01-30 15:47:26 -0800 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-01-30 15:47:26 -0800 |
| commit | a35aa51d69b5f4af2ff5821d78f6cf1af0faf398 (patch) | |
| tree | 31a76d09be6dc2c80f6896adfeda28b94828b916 | |
| parent | db45660630bab2dad9cbcb722e492f32c21db76c (diff) | |
| download | nspr-hg-a35aa51d69b5f4af2ff5821d78f6cf1af0faf398.tar.gz | |
Bug 1244320: Rename HAVE_CLOCK_MONOTONIC to _PR_HAVE_CLOCK_MONOTONIC to
avoid conflict with mozilla-config.h. r=wtc
| -rw-r--r-- | pr/include/md/_freebsd.h | 2 | ||||
| -rw-r--r-- | pr/include/md/_linux.h | 2 | ||||
| -rw-r--r-- | pr/include/md/_netbsd.h | 2 | ||||
| -rw-r--r-- | pr/include/md/_openbsd.h | 2 | ||||
| -rw-r--r-- | pr/include/md/_unixos.h | 2 | ||||
| -rw-r--r-- | pr/src/md/unix/unix.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/pr/include/md/_freebsd.h b/pr/include/md/_freebsd.h index 1dafc115..9a179bcb 100644 --- a/pr/include/md/_freebsd.h +++ b/pr/include/md/_freebsd.h @@ -230,7 +230,7 @@ extern void _MD_EarlyInit(void); #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit -#define HAVE_CLOCK_MONOTONIC +#define _PR_HAVE_CLOCK_MONOTONIC /* * We wrapped the select() call. _MD_SELECT refers to the built-in, diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h index d378db56..b4b298b7 100644 --- a/pr/include/md/_linux.h +++ b/pr/include/md/_linux.h @@ -671,7 +671,7 @@ extern void _MD_EarlyInit(void); #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit -#define HAVE_CLOCK_MONOTONIC +#define _PR_HAVE_CLOCK_MONOTONIC /* * We wrapped the select() call. _MD_SELECT refers to the built-in, diff --git a/pr/include/md/_netbsd.h b/pr/include/md/_netbsd.h index 8836f878..945d94ff 100644 --- a/pr/include/md/_netbsd.h +++ b/pr/include/md/_netbsd.h @@ -211,7 +211,7 @@ extern void _MD_EarlyInit(void); #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit -#define HAVE_CLOCK_MONOTONIC +#define _PR_HAVE_CLOCK_MONOTONIC /* * We wrapped the select() call. _MD_SELECT refers to the built-in, diff --git a/pr/include/md/_openbsd.h b/pr/include/md/_openbsd.h index 074bdd78..666c177e 100644 --- a/pr/include/md/_openbsd.h +++ b/pr/include/md/_openbsd.h @@ -192,7 +192,7 @@ struct _MDCPU { #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit -#define HAVE_CLOCK_MONOTONIC +#define _PR_HAVE_CLOCK_MONOTONIC /* * We wrapped the select() call. _MD_SELECT refers to the built-in, diff --git a/pr/include/md/_unixos.h b/pr/include/md/_unixos.h index 04d99041..ea46b3a4 100644 --- a/pr/include/md/_unixos.h +++ b/pr/include/md/_unixos.h @@ -302,7 +302,7 @@ extern PRIntervalTime _PR_UNIX_TicksPerSecond(void); #define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond #endif -#ifdef HAVE_CLOCK_MONOTONIC +#ifdef _PR_HAVE_CLOCK_MONOTONIC extern PRIntervalTime _PR_UNIX_GetInterval2(void); extern PRIntervalTime _PR_UNIX_TicksPerSecond2(void); #define _MD_INTERVAL_INIT() diff --git a/pr/src/md/unix/unix.c b/pr/src/md/unix/unix.c index 7405053f..fdae1199 100644 --- a/pr/src/md/unix/unix.c +++ b/pr/src/md/unix/unix.c @@ -3040,7 +3040,7 @@ PRIntervalTime _PR_UNIX_TicksPerSecond() } #endif -#if defined(HAVE_CLOCK_MONOTONIC) +#if defined(_PR_HAVE_CLOCK_MONOTONIC) PRIntervalTime _PR_UNIX_GetInterval2() { struct timespec time; |