Index: src/platform.h |
diff --git a/src/platform.h b/src/platform.h |
index fbf64886a8a13c389fd57cdfc3f281ea1642316b..497e3a86cd70ecaac15105ea39ef799e720f61db 100644 |
--- a/src/platform.h |
+++ b/src/platform.h |
@@ -28,7 +28,6 @@ |
#include "src/base/build_config.h" |
#include "src/platform/mutex.h" |
#include "src/platform/semaphore.h" |
-#include "src/vector.h" |
#ifdef __sun |
# ifndef signbit |
@@ -91,6 +90,7 @@ inline intptr_t InternalGetExistingThreadLocal(intptr_t index) { |
const intptr_t kTibExtraTlsOffset = 0xF94; |
const intptr_t kMaxInlineSlots = 64; |
const intptr_t kMaxSlots = kMaxInlineSlots + 1024; |
+ const intptr_t kPointerSize = sizeof(void*); |
ASSERT(0 <= index && index < kMaxSlots); |
if (index < kMaxInlineSlots) { |
return static_cast<intptr_t>(__readfsdword(kTibInlineTlsOffset + |
@@ -247,13 +247,14 @@ class OS { |
// Safe formatting print. Ensures that str is always null-terminated. |
// Returns the number of chars written, or -1 if output was truncated. |
- static int SNPrintF(Vector<char> str, const char* format, ...); |
- static int VSNPrintF(Vector<char> str, |
+ static int SNPrintF(char* str, int length, const char* format, ...); |
+ static int VSNPrintF(char* str, |
+ int length, |
const char* format, |
va_list args); |
static char* StrChr(char* str, int c); |
- static void StrNCpy(Vector<char> dest, const char* src, size_t n); |
+ static void StrNCpy(char* dest, int length, const char* src, size_t n); |
// Support for the profiler. Can do nothing, in which case ticks |
// occuring in shared libraries will not be properly accounted for. |
@@ -408,13 +409,7 @@ class VirtualMemory { |
class Thread { |
public: |
// Opaque data type for thread-local storage keys. |
- // LOCAL_STORAGE_KEY_MIN_VALUE and LOCAL_STORAGE_KEY_MAX_VALUE are specified |
- // to ensure that enumeration type has correct value range (see Issue 830 for |
- // more details). |
- enum LocalStorageKey { |
- LOCAL_STORAGE_KEY_MIN_VALUE = kMinInt, |
- LOCAL_STORAGE_KEY_MAX_VALUE = kMaxInt |
- }; |
+ typedef int32_t LocalStorageKey; |
class Options { |
public: |