summaryrefslogtreecommitdiffstats
path: root/WebKit/android/stl
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-03-05 14:34:32 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-05 14:34:32 -0800
commit635860845790a19bf50bbc51ba8fb66a96dde068 (patch)
treeef6ad9ff73a5b57f65249d4232a202fa77e6a140 /WebKit/android/stl
parent8e35f3cfc7fba1d1c829dc557ebad6409cbe16a2 (diff)
downloadexternal_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.zip
external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.gz
external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.bz2
auto import from //depot/cupcake/@136594
Diffstat (limited to 'WebKit/android/stl')
-rw-r--r--WebKit/android/stl/algorithm3
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/stl/algorithm b/WebKit/android/stl/algorithm
index 8255def..33968ab 100644
--- a/WebKit/android/stl/algorithm
+++ b/WebKit/android/stl/algorithm
@@ -58,6 +58,7 @@ namespace WebCore {
#include <float.h>
#include <math.h>
#include <stdint.h>
+#include <stddef.h>
#ifndef WCHAR_MAX
#define WCHAR_MAX 0xFFFF
@@ -182,7 +183,7 @@ _NUMERIC_LIMITS (unsigned long long, 0, ULLONG_MAX, 0, false, true, true);
#endif
//--------------------------------------------------------------------------------------
-typedef int ptrdiff_t;
+using ::ptrdiff_t;
typedef bool (* Comparator)(const void*, const void*);
extern void sort(const void** start, const void** end, Comparator comp);