Merge branch 'master' into merge

luau-lang · Aug 16, 2024 · 8c4f907 · 8c4f907
2 parents c229a9e + 1788e23
commit 8c4f907
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Ast/src/TimeTrace.cpp b/Ast/src/TimeTrace.cpp
@@ -40,7 +40,7 @@ static double getClockPeriod()
     mach_timebase_info_data_t result = {};
     mach_timebase_info(&result);
     return double(result.numer) / double(result.denom) * 1e-9;
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
     return 1e-9;
 #else
     return 1.0 / double(CLOCKS_PER_SEC);
@@ -55,7 +55,7 @@ static double getClockTimestamp()
     return double(result.QuadPart);
 #elif defined(__APPLE__)
     return double(mach_absolute_time());
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
     timespec now;
     clock_gettime(CLOCK_MONOTONIC, &now);
     return now.tv_sec * 1e9 + now.tv_nsec;

diff --git a/VM/src/lperf.cpp b/VM/src/lperf.cpp
@@ -30,7 +30,7 @@ static double clock_period()
     mach_timebase_info_data_t result = {};
     mach_timebase_info(&result);
     return double(result.numer) / double(result.denom) * 1e-9;
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
     return 1e-9;
 #else
     return 1.0 / double(CLOCKS_PER_SEC);
@@ -45,7 +45,7 @@ static double clock_timestamp()
     return double(result.QuadPart);
 #elif defined(__APPLE__)
     return double(mach_absolute_time());
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
     timespec now;
     clock_gettime(CLOCK_MONOTONIC, &now);
     return now.tv_sec * 1e9 + now.tv_nsec;

diff --git a/VM/src/lstate.h b/VM/src/lstate.h
@@ -217,7 +217,7 @@ typedef struct global_State
     lua_ExecutionCallbacks ecb;
 
     void (*udatagc[LUA_UTAG_LIMIT])(lua_State*, void*); // for each userdata tag, a gc callback to be called immediately before freeing memory
-    Table* udatamt[LUA_LUTAG_LIMIT]; // metatables for tagged userdata
+    Table* udatamt[LUA_UTAG_LIMIT]; // metatables for tagged userdata
 
     TString* lightuserdataname[LUA_LUTAG_LIMIT]; // names for tagged lightuserdata