diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebKit/win/WebPreferences.cpp | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebKit/win/WebPreferences.cpp')
| -rw-r--r-- | Source/WebKit/win/WebPreferences.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/win/WebPreferences.cpp b/Source/WebKit/win/WebPreferences.cpp index 01cab2b..a4869b6 100644 --- a/Source/WebKit/win/WebPreferences.cpp +++ b/Source/WebKit/win/WebPreferences.cpp @@ -40,7 +40,7 @@ #include <WebCore/PlatformString.h> #include <limits> #include <shlobj.h> -#include <tchar.h> +#include <wchar.h> #include <wtf/HashMap.h> #include <wtf/OwnArrayPtr.h> #include <wtf/text/CString.h> @@ -340,12 +340,12 @@ LONGLONG WebPreferences::longlongValueForKey(CFStringRef key) void WebPreferences::setStringValue(CFStringRef key, LPCTSTR value) { BSTR val = stringValueForKey(key); - if (val && !_tcscmp(val, value)) + if (val && !wcscmp(val, value)) return; SysFreeString(val); RetainPtr<CFStringRef> valueRef(AdoptCF, - CFStringCreateWithCharactersNoCopy(0, (UniChar*)_wcsdup(value), (CFIndex)_tcslen(value), kCFAllocatorMalloc)); + CFStringCreateWithCharactersNoCopy(0, (UniChar*)_wcsdup(value), (CFIndex)wcslen(value), kCFAllocatorMalloc)); setValueForKey(key, valueRef.get()); postPreferencesChangesNotification(); |