diff options
| author | Richard Oliver <richard@richard-oliver.co.uk> | 2017-10-28 16:38:30 +0100 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2017-10-30 09:56:27 -0700 |
| commit | 10fd9f6e477555ca93d28094c2976b2ea0198798 (patch) | |
| tree | 168bb742fc48d1e0847e2dd9301bc5b2decf811a | |
| parent | 45a9c31d5d915010deb6d8073fe22cf8c10f12de (diff) | |
| download | openvswitch-10fd9f6e477555ca93d28094c2976b2ea0198798.tar.gz | |
timeval: Check for OS-provided clock_gettime on macOS
[Problem]
Compilation error on newer versions of macOS (Sierra onwards) due to
multiple declarations of clock_gettime.
[Solution]
Have configure check for clock_gettime and check this result in
timeval to avoid incorrectly declaring/defining clock_gettime again.
[Testing]
Source code now successfully builds on macOS.
Signed-off-by: Richard Oliver <richard@richard-oliver.co.uk>
Signed-off-by: Ben Pfaff <blp@ovn.org>
| -rw-r--r-- | AUTHORS.rst | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lib/timeval.c | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst index 4a80802dd..ff1cd3701 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -263,6 +263,7 @@ Raymond Burkholder ray@oneunified.net Reid Price reid@nicira.com Remko Tronçon git@el-tramo.be Rich Lane rlane@bigswitch.com +Richard Oliver richard@richard-oliver.co.uk Rishi Bamba rishi.bamba@tcs.com Rob Adams readams@readams.net Robert Åkerblom-Andersson Robert.nr1@gmail.com diff --git a/configure.ac b/configure.ac index 27425991a..9e0081832 100644 --- a/configure.ac +++ b/configure.ac @@ -112,7 +112,7 @@ AC_CHECK_MEMBERS([struct mmsghdr.msg_len], [], [], [[#include <sys/socket.h>]]) AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id], [], [], [[#include <sys/socket.h> #include <netinet/in.h>]]) -AC_CHECK_FUNCS([mlockall strnlen getloadavg statvfs getmntent_r sendmmsg]) +AC_CHECK_FUNCS([mlockall strnlen getloadavg statvfs getmntent_r sendmmsg clock_gettime]) AC_CHECK_HEADERS([mntent.h sys/statvfs.h linux/types.h linux/if_ether.h stdatomic.h]) AC_CHECK_HEADERS([net/if_mib.h], [], [], [[#include <sys/types.h> #include <net/if.h>]]) diff --git a/lib/timeval.c b/lib/timeval.c index b50ff85a5..b60bf3067 100644 --- a/lib/timeval.c +++ b/lib/timeval.c @@ -41,7 +41,7 @@ VLOG_DEFINE_THIS_MODULE(timeval); -#if defined(_WIN32) || defined(__MACH__) +#if !defined(HAVE_CLOCK_GETTIME) typedef unsigned int clockid_t; static int clock_gettime(clock_t id, struct timespec *ts); @@ -52,7 +52,7 @@ static int clock_gettime(clock_t id, struct timespec *ts); #ifndef CLOCK_REALTIME #define CLOCK_REALTIME 2 #endif -#endif /* defined(_WIN32) || defined(__MACH__) */ +#endif /* !defined(HAVE_CLOCK_GETTIME) */ #ifdef _WIN32 /* Number of 100 ns intervals from January 1, 1601 till January 1, 1970. */ @@ -453,7 +453,7 @@ clock_gettime(clock_t id, struct timespec *ts) } #endif /* _WIN32 */ -#ifdef __MACH__ +#if defined(__MACH__) && !defined(HAVE_CLOCK_GETTIME) #include <mach/clock.h> #include <mach/mach.h> static int |