aboutsummaryrefslogtreecommitdiff
path: root/src/common/compat_time.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-09-15 16:15:27 -0400
committerNick Mathewson <nickm@torproject.org>2017-09-15 16:24:21 -0400
commit7a597718bb9cda3dd553c2b12fd42f04ead44c85 (patch)
tree4f469c213ce1a688c8bf4c8f6874823117e705f9 /src/common/compat_time.h
parent40ce9819dd7c589f624715c9c800cff714140a70 (diff)
downloadtor-7a597718bb9cda3dd553c2b12fd42f04ead44c85.tar.gz
tor-7a597718bb9cda3dd553c2b12fd42f04ead44c85.zip
Split some long #if lines to make the #endif annotator happy
Diffstat (limited to 'src/common/compat_time.h')
-rw-r--r--src/common/compat_time.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/compat_time.h b/src/common/compat_time.h
index 90194c5ebc..e5181beac6 100644
--- a/src/common/compat_time.h
+++ b/src/common/compat_time.h
@@ -28,7 +28,7 @@
#include <time.h>
#endif
-#if !defined(HAVE_GETTIMEOFDAY) && !defined(HAVE_STRUCT_TIMEVAL_TV_SEC)
+#if !defined(HAVE_STRUCT_TIMEVAL_TV_SEC)
/** Implementation of timeval for platforms that don't have it. */
struct timeval {
time_t tv_sec;
@@ -54,7 +54,8 @@ typedef struct monotime_t {
#endif
} monotime_t;
-#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC_COARSE)
+#if defined(CLOCK_MONOTONIC_COARSE) && \
+ defined(HAVE_CLOCK_GETTIME)
#define MONOTIME_COARSE_FN_IS_DIFFERENT
#define monotime_coarse_t monotime_t
#elif defined(_WIN32)