Title: [150997] trunk/Source/WTF
- Revision
- 150997
- Author
- [email protected]
- Date
- 2013-05-30 18:07:10 -0700 (Thu, 30 May 2013)
Log Message
Unreviewed build fix for Mac.
* wtf/OSAllocator.h:
* wtf/text/WTFString.h:
(WTF::String::fromUTF8):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (150996 => 150997)
--- trunk/Source/WTF/ChangeLog 2013-05-31 00:53:31 UTC (rev 150996)
+++ trunk/Source/WTF/ChangeLog 2013-05-31 01:07:10 UTC (rev 150997)
@@ -1,5 +1,13 @@
2013-05-30 Roger Fong <[email protected]>
+ Unreviewed build fix for Mac.
+
+ * wtf/OSAllocator.h:
+ * wtf/text/WTFString.h:
+ (WTF::String::fromUTF8):
+
+2013-05-30 Roger Fong <[email protected]>
+
Get rid of _javascript_ exports file on AppleWin port.
https://bugs.webkit.org/show_bug.cgi?id=117050.
Modified: trunk/Source/WTF/wtf/OSAllocator.h (150996 => 150997)
--- trunk/Source/WTF/wtf/OSAllocator.h 2013-05-31 00:53:31 UTC (rev 150996)
+++ trunk/Source/WTF/wtf/OSAllocator.h 2013-05-31 01:07:10 UTC (rev 150997)
@@ -57,13 +57,13 @@
// decommitAndRelease should be called on a region of VM allocated by a single reservation,
// the memory must all currently be in a committed state.
WTF_EXPORT_PRIVATE static void* reserveAndCommit(size_t, Usage = UnknownUsage, bool writable = true, bool executable = false, bool includesGuardPages = false);
- WTF_EXPORT_PRIVATE static void decommitAndRelease(void* base, size_t size);
+ static void decommitAndRelease(void* base, size_t size);
// These methods are akin to reserveAndCommit/decommitAndRelease, above - however rather than
// committing/decommitting the entire region additional parameters allow a subregion to be
// specified.
WTF_EXPORT_PRIVATE static void* reserveAndCommit(size_t reserveSize, size_t commitSize, Usage = UnknownUsage, bool writable = true, bool executable = false);
- WTF_EXPORT_PRIVATE static void decommitAndRelease(void* releaseBase, size_t releaseSize, void* decommitBase, size_t decommitSize);
+ static void decommitAndRelease(void* releaseBase, size_t releaseSize, void* decommitBase, size_t decommitSize);
// Reallocate an existing, committed allocation.
// The prior allocation must be fully comitted, and the new size will also be fully committed.
Modified: trunk/Source/WTF/wtf/text/WTFString.h (150996 => 150997)
--- trunk/Source/WTF/wtf/text/WTFString.h 2013-05-31 00:53:31 UTC (rev 150996)
+++ trunk/Source/WTF/wtf/text/WTFString.h 2013-05-31 01:07:10 UTC (rev 150997)
@@ -453,8 +453,8 @@
// the input data contains invalid UTF-8 sequences.
WTF_EXPORT_STRING_API static String fromUTF8(const LChar*, size_t);
WTF_EXPORT_STRING_API static String fromUTF8(const LChar*);
- WTF_EXPORT_STRING_API static String fromUTF8(const char* s, size_t length) { return fromUTF8(reinterpret_cast<const LChar*>(s), length); };
- WTF_EXPORT_STRING_API static String fromUTF8(const char* s) { return fromUTF8(reinterpret_cast<const LChar*>(s)); };
+ static String fromUTF8(const char* s, size_t length) { return fromUTF8(reinterpret_cast<const LChar*>(s), length); };
+ static String fromUTF8(const char* s) { return fromUTF8(reinterpret_cast<const LChar*>(s)); };
WTF_EXPORT_STRING_API static String fromUTF8(const CString&);
// Tries to convert the passed in string to UTF-8, but will fall back to Latin-1 if the string is not valid UTF-8.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
