mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-11-25 09:47:17 +00:00
Code Issues 1 Releases Wiki Activity

Refactor __MACH__ to JANET_APPLE

Browse Source
This commit is contained in:
Jason Pepas 2022-03-17 01:20:55 -05:00
parent c815185574
commit f270739f9f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/os.c
View File

@ -68,7 +68,7 @@ extern char **environ;
#endif #endif
/* For macos */ /* For macos */
#ifdef __MACH__ #ifdef JANET_APPLE
#include <mach/clock.h> #include <mach/clock.h>
#include <mach/mach.h> #include <mach/mach.h>
#endif #endif

4
src/core/util.c
View File

@ -790,7 +790,7 @@ int32_t janet_sorted_keys(const JanetKV *dict, int32_t cap, int32_t *index_buffe
/* Clock shims for various platforms */ /* Clock shims for various platforms */
#ifdef JANET_GETTIME #ifdef JANET_GETTIME
/* For macos */ /* For macos */
#ifdef __MACH__ #ifdef JANET_APPLE
#include <mach/clock.h> #include <mach/clock.h>
#include <mach/mach.h> #include <mach/mach.h>
#endif #endif
@ -806,7 +806,7 @@ int janet_gettime(struct timespec *spec) {
spec->tv_nsec = wintime % 10000000LL * 100; spec->tv_nsec = wintime % 10000000LL * 100;
return 0; return 0;
} }
#elif defined(__MACH__) #elif defined(JANET_APPLE)
int janet_gettime(struct timespec *spec) { int janet_gettime(struct timespec *spec) {
clock_serv_t cclock; clock_serv_t cclock;
mach_timespec_t mts; mach_timespec_t mts;

4
src/include/janet.h
View File

@ -57,8 +57,8 @@ extern "C" {
#define JANET_BSD 1 #define JANET_BSD 1
#endif #endif
/* Check for Mac */ /* Check for macOS or OS X */
#ifdef __APPLE__ #if defined(__APPLE__) && defined(__MACH__)
#define JANET_APPLE 1 #define JANET_APPLE 1
#endif #endif