aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-16 11:00:29 +0000
committerduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-16 11:00:29 +0000
commit8fb99342c6d2f89b5fef16ebe00230350371dc33 (patch)
treefb8dc8288efffdf9f68aafacce6bf9b13d02ce02
parentad1b2598601bed6061b4c7fb89f0d7274263b628 (diff)
downloadruby-8fb99342c6d2f89b5fef16ebe00230350371dc33.tar.gz
* enc/unicode.h: Additional uses of ONIG_CASE_MAPPING compilation switch
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55020 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--enc/unicode.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4505afd..1c22673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 16 20:00:30 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
+
+ * enc/unicode.h: Additional uses of ONIG_CASE_MAPPING compilation switch
+
Mon May 16 19:46:33 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* include/ruby/oniguruma.h: Introducing ONIG_CASE_MAPPING compilation
diff --git a/enc/unicode.c b/enc/unicode.c
index 3aeadb8..8f978bc 100644
--- a/enc/unicode.c
+++ b/enc/unicode.c
@@ -137,6 +137,7 @@ code3_equal(const OnigCodePoint *x, const OnigCodePoint *y)
return 1;
}
+#ifdef ONIG_CASE_MAPPING
/* macros related to ONIGENC_CASE flags */
/* defined here because not used in other files */
#define ONIGENC_CASE_SPECIALS (ONIGENC_CASE_TITLECASE|ONIGENC_CASE_IS_TITLECASE|ONIGENC_CASE_UP_SPECIAL|ONIGENC_CASE_DOWN_SPECIAL)
@@ -161,9 +162,11 @@ code3_equal(const OnigCodePoint *x, const OnigCodePoint *y)
#define IT ONIGENC_CASE_IS_TITLECASE
#define I(n) OnigSpecialIndexEncode(n)
#define L(n) SpecialsLengthEncode(n)
+#endif /* ONIG_CASE_MAPPING */
#include "enc/unicode/casefold.h"
+#ifdef ONIG_CASE_MAPPING
#undef U
#undef D
#undef F
@@ -173,6 +176,7 @@ code3_equal(const OnigCodePoint *x, const OnigCodePoint *y)
#undef IT
#undef I
#undef L
+#endif /* ONIG_CASE_MAPPING */
#include "enc/unicode/name2ctype.h"