diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-19 13:14:06 (GMT) |
---|---|---|
committer | Kent Hansen <khansen@trolltech.com> | 2009-09-04 10:41:00 (GMT) |
commit | b9fdc5636c166e26195d783378ff4da43b755bc5 (patch) | |
tree | 68d7467d8310eca01e75f8707ca9ca3a43e09f6a /src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp | |
parent | 6f1ff47beeee6a6af489df58813ebd87237c93b0 (diff) | |
download | Qt-b9fdc5636c166e26195d783378ff4da43b755bc5.zip Qt-b9fdc5636c166e26195d783378ff4da43b755bc5.tar.gz Qt-b9fdc5636c166e26195d783378ff4da43b755bc5.tar.bz2 |
Fix compilation error on Solaris: mmap/munmap take/return a char*, not void*.
"../JavaScriptCore/interpreter/RegisterFile.h", line 128: Error: Using static_cast to convert from char* to JSC::Register* not allowed.
Error: Formal argument 1 of type char* in call to munmap(char*, unsigned) is being passed JSC::Register*.
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp b/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp index 06ddefc..29a13ca 100644 --- a/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp @@ -34,7 +34,7 @@ namespace JSC { RegisterFile::~RegisterFile() { #if HAVE(MMAP) - munmap(m_buffer, ((m_max - m_start) + m_maxGlobals) * sizeof(Register)); + munmap(reinterpret_cast<char*>(m_buffer), ((m_max - m_start) + m_maxGlobals) * sizeof(Register)); #elif HAVE(VIRTUALALLOC) VirtualFree(m_buffer, 0, MEM_RELEASE); #else |