7809301: fix #535, compile error when including mach_time.h

microsoft · Jun 24, 2016 · 5c196a2 · 5c196a2
1 parent b73a70c
commit 5c196a2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Frameworks/Starboard/mach.cpp b/Frameworks/Starboard/mach.cpp
@@ -79,4 +79,11 @@ kern_return_t mach_timebase_info(mach_timebase_info_t tinfo) {
     return 0;
 }
 
+uint64_t mach_absolute_time() {
+    LARGE_INTEGER count;
+    QueryPerformanceCounter(&count);
+    // mach_absolute_time is unsigned, but this function returns a signed value.
+    return (uint64_t)count.QuadPart;
+}
+
 }
diff --git a/build/Starboard/dll/Starboard.def b/build/Starboard/dll/Starboard.def
@@ -129,6 +129,7 @@ LIBRARY Starboard
         arc4random
         arc4random_uniform
         mach_timebase_info
+        mach_absolute_time
         sysctlbyname
 
         EbrIncrement

diff --git a/include/WOCStdLib/mach/mach_time.h b/include/WOCStdLib/mach/mach_time.h
@@ -32,12 +32,7 @@ typedef struct mach_timebase_info* mach_timebase_info_t;
 __BEGIN_DECLS
 
 kern_return_t mach_timebase_info(mach_timebase_info_t tinfo);
-__inline uint64_t mach_absolute_time() {
-    LARGE_INTEGER count;
-    QueryPerformanceCounter(&count);
-    // mach_absolute_time is unsigned, but this function returns a signed value.
-    return (uint64_t)count.QuadPart;
-}
+uint64_t mach_absolute_time();
 
 __END_DECLS