diff options
| author |  Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2014-11-24 09:56:28 -0800 |
|---|---|---|
| committer | Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2014-11-24 09:56:36 -0800 |
| commit | 04f10a4b349d8d96c6bff56ffb180e16f5417cfe (patch) | |
| tree | 8cd83fcc0a3250e58b9a6491fb92ec3799b31a55 | |
| parent | fdf7ef6392f96d66b741d8b19b557a3f43ae939f (diff) | |
Fixed exports for win32
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | src/core/basetypes/MCString.h | 1 | ||||
| -rw-r--r-- | src/core/basetypes/MCStringWin32.cpp | 2 | ||||
| -rw-r--r-- | src/core/basetypes/MCWin32.h | 15 |
4 files changed, 6 insertions, 20 deletions
@@ -37,7 +37,7 @@ build-windows/include build-windows/_headers_depends build-windows/mailcore2/Debug build-windows/mailcore2/Release -build-windows/mailcore2/mailcore2/mailcore2.Windows/Release -build-windows/mailcore2/mailcore2/mailcore2.Windows/x64/Release -build-windows/mailcore2/mailcore2/mailcore2.Windows/Debug -build-windows/mailcore2/mailcore2/mailcore2.Windows/x64/Debug +build-windows/mailcore2/mailcore2/Release +build-windows/mailcore2/mailcore2/x64/Release +build-windows/mailcore2/mailcore2/Debug +build-windows/mailcore2/mailcore2/x64/Debug diff --git a/src/core/basetypes/MCString.h b/src/core/basetypes/MCString.h index 0735d321..842ff5b8 100644 --- a/src/core/basetypes/MCString.h +++ b/src/core/basetypes/MCString.h @@ -138,6 +138,7 @@ namespace mailcore { void appendUTF8CharactersLength(const char * UTF8Characters, unsigned int length); }; + MAILCORE_EXPORT void setICUDataDirectory(String * directory); } diff --git a/src/core/basetypes/MCStringWin32.cpp b/src/core/basetypes/MCStringWin32.cpp index f2c659aa..8ef891d1 100644 --- a/src/core/basetypes/MCStringWin32.cpp +++ b/src/core/basetypes/MCStringWin32.cpp @@ -10,7 +10,7 @@ String * String::uuidString() { GUID uuid; CoCreateGuid(&uuid); - OLECHAR szGUID[37] = { 0 }; + OLECHAR szGUID[39] = { 0 }; char uuidString[37] = { 0 }; StringFromGUID2(uuid, (LPOLESTR)szGUID, 39); // per documentation. for(int i = 0; i < UUID_STR_LEN; i++) { diff --git a/src/core/basetypes/MCWin32.h b/src/core/basetypes/MCWin32.h index 42faa744..24ec7448 100644 --- a/src/core/basetypes/MCWin32.h +++ b/src/core/basetypes/MCWin32.h @@ -6,21 +6,6 @@ #ifdef _MSC_VER -/* -#if WINAPI_FAMILY == WINAPI_FAMILY_PC_APP -#error pc app -#elif WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP -#error phone app -#elif WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP -#error desktop app -#else -#error other -#endif -*/ - -#undef WINAPI_FAMILY -#define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP - #define _CRT_RAND_S #include <stdlib.h> |