firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 22:03:03 +01:00
Code Issues

Make it build with icu60

Browse Source
This commit is contained in:
AlexPeshkoff 2018-02-10 19:43:26 +03:00
parent 61ea791c3a
commit a4cb621bf5
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/common.h
View File

@ -997,4 +997,7 @@ namespace Firebird {
static IMessageMetadata* const DELAYED_OUT_FORMAT = reinterpret_cast<IMessageMetadata*>(1);
}
#undef UCHAR_TYPE
#define UCHAR_TYPE uint16_t
#endif /* COMMON_COMMON_H */

4
src/common/unicode_util.h
View File

@ -31,6 +31,10 @@
#include "../common/IntlUtil.h"
#include "../common/os/mod_loader.h"
#include "../common/classes/fb_string.h"
#undef U_SHOW_CPLUSPLUS_API
#define U_SHOW_CPLUSPLUS_API 0
#include <unicode/ucnv.h>
struct UCollator;

1
src/intl/cs_icu.cpp
View File

@ -28,7 +28,6 @@
#include "../intl/ldcommon.h"
#include "cs_icu.h"
#include "cv_icu.h"
#include <unicode/ucnv.h>
#include "../common/unicode_util.h"

1
src/intl/cv_icu.cpp
View File

@ -28,7 +28,6 @@
#include "../intl/ldcommon.h"
#include "ld_proto.h"
#include "cv_icu.h"
#include <unicode/ucnv.h>
#include "../common/unicode_util.h"