# include <sys/time.h>
#endif
-#if defines(__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>
# 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
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);
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());