X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmtime.c;h=454e99fb27a5ac3b415d92ab98d2f39245dbea2b;hb=2864452800521ed6a9a821efbee702ef19993ee6;hp=6cd165385fa91b3f320f57e8a1414bbd6f974cad;hpb=c6ce6df890b7c66defc54c4dd4edbd940728fe94;p=vlc

diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index 6cd165385f..454e99fb27 100644
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -56,7 +56,7 @@
 #   include <sys/time.h>
 #endif
 
-#ifdef __APPLE__ && && !defined(__powerpc__) && !defined(__ppc__) && !defined(__ppc64__)
+#if defined(__APPLE__) && !defined(__powerpc__) && !defined(__ppc__) && !defined(__ppc64__)
 #define USE_APPLE_MACH 1
 #   include <mach/mach.h>
 #   include <mach/mach_time.h>
@@ -80,9 +80,9 @@ int nanosleep(struct timespec *, struct timespec *);
 
 # if (_POSIX_CLOCK_SELECTION < 0)
 /*
- * We cannot use the monotonic clock is clock selection is not available,
+ * We cannot use the monotonic clock if clock selection is not available,
  * as it would screw vlc_cond_timedwait() completely. Instead, we have to
- * stick to the realtime clock. Nevermind it screws everything when ntpdate
+ * stick to the realtime clock. Nevermind it screws everything up when ntpdate
  * warps the wall clock.
  */
 #  undef CLOCK_MONOTONIC
@@ -324,7 +324,8 @@ mtime_t mdate( void )
         i_previous_time = res;
         LeaveCriticalSection( &date_lock );
     }
-#elif USE_APPLE_MACH /* The version that should be used, if it was cancelable */
+#elif defined(USE_APPLE_MACH)
+    /* The version that should be used, if it was cancelable */
     pthread_once(&mtime_timebase_info_once, mtime_init_timebase);
     uint64_t mach_time = date * 1000 * mtime_timebase_info.denom / mtime_timebase_info.numer;
     mach_wait_until(mach_time);
@@ -425,7 +426,8 @@ void msleep( mtime_t delay )
 
     while( nanosleep( &ts_delay, &ts_delay ) && ( errno == EINTR ) );
 
-#elif USE_APPLE_MACH /* The version that should be used, if it was cancelable */
+#elif defined (USE_APPLE_MACH)
+    /* The version that should be used, if it was cancelable */
     pthread_once(&mtime_timebase_info_once, mtime_init_timebase);
     uint64_t mach_time = delay * 1000 * mtime_timebase_info.denom / mtime_timebase_info.numer;
     mach_wait_until(mach_time + mach_absolute_time());