Merge pull request #31 from pandamicro/master

Fix iOS mmap and TypedArray issue
This commit is contained in:
pandamicro
2017-07-18 09:46:57 +08:00
committed by GitHub
4 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -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 */
+1 -1
View File
@@ -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
Binary file not shown.
Binary file not shown.