Merge pull request #1686 from mspang/glslang-fuchsia-build

Port Unix/ossource.cpp to Fuchsia

Merge pull request #1686 from mspang/glslang-fuchsia-build
f96d7dc2 · John Kessenich · GitHub · 16948832 · d39c040d · f96d7dc2
Unverified Commit f96d7dc2 authored Jan 31, 2019 by John Kessenich Committed by GitHub Jan 31, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

ossource.cpp glslang/OSDependent/Unix/ossource.cpp +4 -1

No files found.
--- a/glslang/OSDependent/Unix/ossource.cpp
+++ b/glslang/OSDependent/Unix/ossource.cpp
@@ -45,7 +45,10 @@
 #include <stdint.h>
 #include <cstdio>
 #include <sys/time.h>
+
+#if !defined(__Fuchsia__)
 #include <sys/resource.h>
+#endif

 namespace glslang {

@@ -70,7 +73,7 @@ static void DetachThreadLinux(void *)
 //
 void OS_CleanupThreadData(void)
 {
-#ifdef __ANDROID__
+#if defined(__ANDROID__) || defined(__Fuchsia__)
    DetachThreadLinux(NULL);
 #else
    int old_cancel_state, old_cancel_type;