Index: base/i18n/icu_string_conversions.h |
=================================================================== |
--- base/i18n/icu_string_conversions.h (revision 97736) |
+++ base/i18n/icu_string_conversions.h (working copy) |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2009 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -8,6 +8,7 @@ |
#include <string> |
+#include "base/i18n/base_i18n_export.h" |
#include "base/string16.h" |
namespace base { |
@@ -35,40 +36,40 @@ |
}; |
// Names of codepages (charsets) understood by icu. |
-extern const char kCodepageLatin1[]; // a.k.a. ISO 8859-1 |
-extern const char kCodepageUTF8[]; |
-extern const char kCodepageUTF16BE[]; |
-extern const char kCodepageUTF16LE[]; |
+BASE_I18N_EXPORT extern const char kCodepageLatin1[]; // a.k.a. ISO 8859-1 |
+BASE_I18N_EXPORT extern const char kCodepageUTF8[]; |
+BASE_I18N_EXPORT extern const char kCodepageUTF16BE[]; |
+BASE_I18N_EXPORT extern const char kCodepageUTF16LE[]; |
// Converts between UTF-16 strings and the encoding specified. If the |
// encoding doesn't exist or the encoding fails (when on_error is FAIL), |
// returns false. |
-bool UTF16ToCodepage(const string16& utf16, |
- const char* codepage_name, |
- OnStringConversionError::Type on_error, |
- std::string* encoded); |
-bool CodepageToUTF16(const std::string& encoded, |
- const char* codepage_name, |
- OnStringConversionError::Type on_error, |
- string16* utf16); |
+BASE_I18N_EXPORT bool UTF16ToCodepage(const string16& utf16, |
+ const char* codepage_name, |
+ OnStringConversionError::Type on_error, |
+ std::string* encoded); |
+BASE_I18N_EXPORT bool CodepageToUTF16(const std::string& encoded, |
+ const char* codepage_name, |
+ OnStringConversionError::Type on_error, |
+ string16* utf16); |
// Converts between wide strings and the encoding specified. If the |
// encoding doesn't exist or the encoding fails (when on_error is FAIL), |
// returns false. |
-bool WideToCodepage(const std::wstring& wide, |
- const char* codepage_name, |
- OnStringConversionError::Type on_error, |
- std::string* encoded); |
-bool CodepageToWide(const std::string& encoded, |
- const char* codepage_name, |
- OnStringConversionError::Type on_error, |
- std::wstring* wide); |
+BASE_I18N_EXPORT bool WideToCodepage(const std::wstring& wide, |
+ const char* codepage_name, |
+ OnStringConversionError::Type on_error, |
+ std::string* encoded); |
+BASE_I18N_EXPORT bool CodepageToWide(const std::string& encoded, |
+ const char* codepage_name, |
+ OnStringConversionError::Type on_error, |
+ std::wstring* wide); |
// Converts from any codepage to UTF-8 and ensures the resulting UTF-8 is |
// normalized. |
-bool ConvertToUtf8AndNormalize(const std::string& text, |
- const std::string& charset, |
- std::string* result); |
+BASE_I18N_EXPORT bool ConvertToUtf8AndNormalize(const std::string& text, |
+ const std::string& charset, |
+ std::string* result); |
} // namespace base |