diff options
author | unknown <bar@mysql.com> | 2005-02-18 13:21:30 +0400 |
---|---|---|
committer | unknown <bar@mysql.com> | 2005-02-18 13:21:30 +0400 |
commit | c2e18c5061e24fcafed4bb4f58ef41b6b0a52fcc (patch) | |
tree | 4369be6c6bd75f596b64ea29c8af74e8c4cc3e69 /strings | |
parent | 1bdc769817bc7938efe6867f29c784c4abf55897 (diff) | |
parent | 29fb8728e45d22241a6d225d787cd5b19e2053cb (diff) | |
download | mariadb-git-c2e18c5061e24fcafed4bb4f58ef41b6b0a52fcc.tar.gz |
Merge: don't add this into configure in as it is already in
config/ac-macros/character_sets.m4
mysys/charset-def.c:
Auto merged
strings/ctype-uca.c:
Auto merged
Diffstat (limited to 'strings')
-rw-r--r-- | strings/ctype-uca.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index 8345d0474f2..80fe0167cdd 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -36,6 +36,7 @@ #include "m_string.h" #include "m_ctype.h" +#ifdef HAVE_UCA_COLLATIONS #define MY_UCA_NPAGES 256 #define MY_UCA_NCHARS 256 @@ -9002,4 +9003,6 @@ CHARSET_INFO my_charset_utf8_persian_uca_ci= &my_collation_any_uca_handler }; -#endif +#endif /* HAVE_CHARSET_utf8 */ + +#endif /* HAVE_UCA_COLLATIONS */ |