Changeset 35055 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

Jul 7, 2008, 8:30:43 PM (17 years ago)

Author:

[email protected]

Message:

releaseFastMallocFreeMemory() should always be defined

Reviewed by Darin.

• JavaScriptCore.exp: Changed to export C++ binding for WTF::releaseFastMallocFreeMemory() instead of C binding for releaseFastMallocFreeMemory().
• wtf/FastMalloc.cpp: Moved definitions of releaseFastMallocFreeMemory() to be in the WTF namespace regardless whether FORCE_SYSTEM_MALLOC is defined.
• wtf/FastMalloc.h: Moved releaseFastMallocFreeMemory() from extern "C" binding to WTF::releaseFastMallocFreeMemory().

Location:

trunk/JavaScriptCore/wtf

Files:

• FastMalloc.cpp (modified) (6 diffs)
• FastMalloc.h (modified) (3 diffs)

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -1 +1 @@
 // Copyright (c) 2005, 2007, Google Inc.
 // All rights reserved.
+// Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
 // 
 // Redistribution and use in source and binary forms, with or without
@@ -197 +198 @@
 }
 
+void releaseFastMallocFreeMemory() { }
+
 } // namespace WTF
-
-extern "C" {
-void releaseFastMallocFreeMemory() { }
-}
 
 #if PLATFORM(DARWIN)
@@ -209 +208 @@
 #endif
 
-#else
+#else // FORCE_SYSTEM_MALLOC
 
 #if HAVE(STDINT_H)
@@ -3688 +3687 @@
 }
 
-extern "C" {
+#endif
+
 void releaseFastMallocFreeMemory()
 {
@@ -3694 +3694 @@
     pageheap->ReleaseFreePages();
 }
-}
-
-#endif
 
 #if WTF_CHANGES
@@ -3702 +3699 @@
 #endif
 
-#endif // USE_SYSTEM_MALLOC
+#endif // FORCE_SYSTEM_MALLOC

trunk/JavaScriptCore/wtf/FastMalloc.h

@@ -1 @@
-// -*- mode: c++; c-basic-offset: 4 -*-
 /*
- *  This file is part of the KDE libraries
- *  Copyright (C) 2005 Apple Computer, Inc.
+ *  Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -41 +39 @@
 #endif
 
+    void releaseFastMallocFreeMemory();
+
 } // namespace WTF
 
@@ -71 +71 @@
 WTF_PRIVATE_INLINE void* operator new[](size_t s) { return fastMalloc(s); }
 WTF_PRIVATE_INLINE void operator delete[](void* p) { fastFree(p); }
-
-extern "C" {
-void releaseFastMallocFreeMemory();
-}
 #endif