Changeset 34597 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 16, 2008, 6:29:21 AM (17 years ago)

Author:

Simon Hausmann

Message:

2008-06-16 Adriaan de Groot <​[email protected]>

Reviewed by Simon.

Fix compilation on Solaris

On some systems, munmap takes a char* instead of a void* (contrary to POSIX and
Single Unix Specification). Since you can always convert from char* to void*
but not vice-versa, do the casting to char*.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/collector.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-06-16  Adriaan de Groot  <[email protected]>
+
+        Reviewed by Simon.
+
+        Fix compilation on Solaris
+
+        On some systems, munmap takes a char* instead of a void* (contrary to POSIX and
+        Single Unix Specification). Since you can always convert from char* to void*
+        but not vice-versa, do the casting to char*.
+
+        * kjs/collector.cpp:
+        (KJS::allocateBlock):
+        (KJS::freeBlock):
+
 2008-06-16  Cameron Zwarich  <[email protected]>
 

trunk/JavaScriptCore/kjs/collector.cpp

@@ -118 +118 @@
 
     if (adjust > 0)
-        munmap(reinterpret_cast<void*>(address), adjust);
+        munmap(reinterpret_cast<char*>(address), adjust);
 
     if (adjust < extra)
-        munmap(reinterpret_cast<void*>(address + adjust + BLOCK_SIZE), extra - adjust);
+        munmap(reinterpret_cast<char*>(address + adjust + BLOCK_SIZE), extra - adjust);
 
     address += adjust;
@@ -139 +139 @@
     free(block);
 #else
-    munmap(block, BLOCK_SIZE);
+    munmap(reinterpret_cast<char *>(block), BLOCK_SIZE);
 #endif
 }