Index: base/string16.h |
=================================================================== |
--- base/string16.h (revision 95578) |
+++ base/string16.h (working copy) |
@@ -30,7 +30,7 @@ |
#include <stdio.h> |
#include <string> |
-#include "base/base_api.h" |
+#include "base/base_export.h" |
#include "base/basictypes.h" |
#if defined(WCHAR_T_IS_UTF16) |
@@ -47,12 +47,12 @@ |
// char16 versions of the functions required by string16_char_traits; these |
// are based on the wide character functions of similar names ("w" or "wcs" |
// instead of "c16"). |
-BASE_API int c16memcmp(const char16* s1, const char16* s2, size_t n); |
-BASE_API size_t c16len(const char16* s); |
-BASE_API const char16* c16memchr(const char16* s, char16 c, size_t n); |
-BASE_API char16* c16memmove(char16* s1, const char16* s2, size_t n); |
-BASE_API char16* c16memcpy(char16* s1, const char16* s2, size_t n); |
-BASE_API char16* c16memset(char16* s, char16 c, size_t n); |
+BASE_EXPORT int c16memcmp(const char16* s1, const char16* s2, size_t n); |
+BASE_EXPORT size_t c16len(const char16* s); |
+BASE_EXPORT const char16* c16memchr(const char16* s, char16 c, size_t n); |
+BASE_EXPORT char16* c16memmove(char16* s1, const char16* s2, size_t n); |
+BASE_EXPORT char16* c16memcpy(char16* s1, const char16* s2, size_t n); |
+BASE_EXPORT char16* c16memset(char16* s, char16 c, size_t n); |
struct string16_char_traits { |
typedef char16 char_type; |
@@ -169,8 +169,8 @@ |
typedef std::basic_string<char16, base::string16_char_traits> string16; |
namespace base { |
-BASE_API extern std::ostream& operator<<(std::ostream& out, |
- const string16& str); |
+BASE_EXPORT extern std::ostream& operator<<(std::ostream& out, |
+ const string16& str); |
} |
#endif // WCHAR_T_IS_UTF32 |