diff options
| author | Jonathan Liu <net147@gmail.com> | 2012-09-01 18:23:11 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-04 10:19:49 +0200 |
| commit | 02c37f59839b7bb36b231560893fa3bccbecc065 (patch) | |
| tree | 27476380bc48b9e70c3fe84cb242ac54bb85c170 /src | |
| parent | 31923d86131e73ff2546c415b943e8ef6cc79567 (diff) | |
| download | qtscript-02c37f59839b7bb36b231560893fa3bccbecc065.tar.gz | |
Fix MinGW-w64 compilation
ENABLE_EXECUTABLE_ALLOCATOR_FIXED requires sys/mman.h which is not
available with MinGW-w64.
Change-Id: I6e76ce0c570e5819657debf813f0e80cef907dd4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h index 48c8d18..17c06bf 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -1008,7 +1008,7 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ /* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in. On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */ #if ENABLE(ASSEMBLER) -#if CPU(X86_64) +#if CPU(X86_64) && !COMPILER(MINGW64) #define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1 #else #define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1 |