Gitweb links:
...log
http://git.netsurf-browser.org/libnsutils.git/shortlog/3a4714779a55f7d099cecddb12354e6e49a8fe14
...commit
http://git.netsurf-browser.org/libnsutils.git/commit/3a4714779a55f7d099cecddb12354e6e49a8fe14
...tree
http://git.netsurf-browser.org/libnsutils.git/tree/3a4714779a55f7d099cecddb12354e6e49a8fe14
The branch, master has been updated
via 3a4714779a55f7d099cecddb12354e6e49a8fe14 (commit)
from 73215930a3f45735ddc31b439111e575d73ab6f3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/libnsutils.git/commit/?id=3a4714779a55f7d099cecddb12354e6e49a8fe14
commit 3a4714779a55f7d099cecddb12354e6e49a8fe14
Author: Zopolis4 <[email protected]>
Commit: Michael Drake <[email protected]>
Restrict overmatching MACH ifdef to only trigger on OSX and Mach
diff --git a/src/time.c b/src/time.c
index 69da504..34519a1 100644
--- a/src/time.c
+++ b/src/time.c
@@ -20,7 +20,7 @@
#include <time.h>
#elif defined(__riscos)
#include <oslib/os.h>
-#elif defined(__MACH__)
+#elif defined(__MACH__) && defined(__APPLE__)
#include <mach/mach.h>
#include <mach/clock.h>
#include <mach/mach_time.h>
@@ -51,7 +51,7 @@ nsuerror nsu_getmonotonic_ms(uint64_t *current_out)
time = os_read_monotonic_time();
current = time * 10;
-#elif defined(__MACH__)
+#elif defined(__MACH__) && defined(__APPLE__)
clock_serv_t cclock;
mach_timespec_t mts;
-----------------------------------------------------------------------
Summary of changes:
src/time.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/time.c b/src/time.c
index 69da504..34519a1 100644
--- a/src/time.c
+++ b/src/time.c
@@ -20,7 +20,7 @@
#include <time.h>
#elif defined(__riscos)
#include <oslib/os.h>
-#elif defined(__MACH__)
+#elif defined(__MACH__) && defined(__APPLE__)
#include <mach/mach.h>
#include <mach/clock.h>
#include <mach/mach_time.h>
@@ -51,7 +51,7 @@ nsuerror nsu_getmonotonic_ms(uint64_t *current_out)
time = os_read_monotonic_time();
current = time * 10;
-#elif defined(__MACH__)
+#elif defined(__MACH__) && defined(__APPLE__)
clock_serv_t cclock;
mach_timespec_t mts;
--
NetSurf generalised utility library
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
