Merge pull request #32 from pandamicro/master

Fix new Uint8Array failure on iOS armv7
2017-07-18 23:20:50 +08:00 · 2017-07-18 23:18:48 +08:00 · 2017-07-18 09:46:57 +08:00 · 2017-07-18 09:46:04 +08:00 · 2017-07-06 10:23:27 +08:00 · 2017-07-06 10:19:13 +08:00
6 changed files with 3 additions and 3 deletions
@@ -77,11 +77,11 @@ enum ThreadType {
 # if defined(DEBUG) || defined(JS_OOM_BREAKPOINT)
 extern bool InitThreadType(void);
 extern void SetThreadType(ThreadType);
-extern uint32_t GetThreadType(void);
+extern JS_PUBLIC_API(uint32_t) GetThreadType(void);
 # else
 inline bool InitThreadType(void) { return true; }
 inline void SetThreadType(ThreadType t) {};
-inline uint32_t GetThreadType(void) { return 0; }
+inline JS_PUBLIC_API(uint32_t) GetThreadType(void) { return 0; }
 # endif

 } /* namespace oom */
@@ -49,7 +49,7 @@ class SystemAllocPolicy
 };

 class ExclusiveContext;
-void ReportOutOfMemory(ExclusiveContext* cxArg);
+JS_PUBLIC_API(void) ReportOutOfMemory(ExclusiveContext* cxArg);

 /*
 * Allocation policy that calls the system memory functions and reports errors
Author	SHA1	Message	Date
pandamicroandGitHub	87575efb54	Merge pull request #32 from pandamicro/master Fix new Uint8Array failure on iOS armv7	2017-07-18 23:20:50 +08:00
pandamicro	cf01dcbc08	Fix new Uint8Array failure on iOS armv7	2017-07-18 23:18:48 +08:00
pandamicroandGitHub	c9d04fee8e	Merge pull request #31 from pandamicro/master Fix iOS mmap and TypedArray issue	2017-07-18 09:46:57 +08:00
pandamicro	1a0fd89c60	Fix iOS mmap and TypedArray issue	2017-07-18 09:46:04 +08:00
pandamicroandGitHub	809ac852c5	Merge pull request #30 from pandamicro/master Update arm64 spidermonkey .a	2017-07-06 10:23:27 +08:00
pandamicro	c715b458cf	Update arm64 spidermonkey .a	2017-07-06 10:19:13 +08:00