From: Debian Science Maintainers Date: Fri, 22 Nov 2024 10:49:45 +0000 (+0100) Subject: _java_mach-arch_fix X-Git-Tag: archive/raspbian/9.3.0+dfsg1-1.1+rpi1^2~6 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=98ace58c06493f7f60c391da0c48c62d03842559;p=vtk9.git _java_mach-arch_fix https://gitlab.kitware.com/diatomic/diy/-/merge_requests/59 From bb0d55c8ae34a43354b1002262dad722c410d8cb Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 13 Jun 2020 13:59:31 +0200 Subject: [PATCH] Fix build on mach-based OS which are not OS X Gbp-Pq: Name 95_java_mach-arch_fix.patch --- diff --git a/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp b/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp index 692cf367..671e69dd 100644 --- a/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp +++ b/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp @@ -3,10 +3,10 @@ #ifndef _WIN32 #include -#ifdef __MACH__ +#if defined(__MACH__) && defined(__APPLE__) #include #include -#endif // __MACH__ +#endif // __MACH__ && __APPLE__ #endif // ifndef _WIN32 namespace diy @@ -16,7 +16,7 @@ typedef unsigned long time_type; inline time_type get_time() { -#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time +#if defined(__MACH__) && defined(__APPLE__) // OS X does not have clock_gettime, use clock_get_time clock_serv_t cclock; mach_timespec_t ts; host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);