mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* Makefile.in (enc/unicode/name2ctype.h): remove duplicated
ifdefs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33793 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
54f282c2c4
commit
f6a635a919
4 changed files with 6 additions and 9 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Sun Nov 20 04:01:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* Makefile.in (enc/unicode/name2ctype.h): remove duplicated
|
||||||
|
ifdefs.
|
||||||
|
|
||||||
Sat Nov 19 19:31:47 2011 Tanaka Akira <akr@fsij.org>
|
Sat Nov 19 19:31:47 2011 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* time.c (TIME_COPY_GMT): copy vtm.utc_offset and vtm.zone too.
|
* time.c (TIME_COPY_GMT): copy vtm.utc_offset and vtm.zone too.
|
||||||
|
|
|
@ -277,7 +277,7 @@ enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
|
||||||
trap '$(RM) $@-1.h $@-2.h' 0 && \
|
trap '$(RM) $@-1.h $@-2.h' 0 && \
|
||||||
set -x; \
|
set -x; \
|
||||||
sed '/^#ifdef USE_UNICODE_PROPERTIES/,/^#endif/d' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-1.h && \
|
sed '/^#ifdef USE_UNICODE_PROPERTIES/,/^#endif/d' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-1.h && \
|
||||||
gperf $(NAME2CTYPE_OPTIONS) < $? > $@-2.h && \
|
sed -e '/^#ifdef USE_UNICODE_PROPERTIES/,/^#endif/{' -e '/^#/d' -e '}' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-2.h && \
|
||||||
diff -DUSE_UNICODE_PROPERTIES $@-1.h $@-2.h > $@.tmp || :; \
|
diff -DUSE_UNICODE_PROPERTIES $@-1.h $@-2.h > $@.tmp || :; \
|
||||||
$(MV) $@.tmp $@ && \
|
$(MV) $@.tmp $@ && \
|
||||||
$(CP) $? $(?:.kwd=.src) && \
|
$(CP) $? $(?:.kwd=.src) && \
|
||||||
|
|
|
@ -36,7 +36,6 @@ error "gperf generated tables don't work with this execution character set. Plea
|
||||||
|
|
||||||
#define long size_t
|
#define long size_t
|
||||||
|
|
||||||
#ifdef USE_UNICODE_PROPERTIES
|
|
||||||
#ifdef USE_UNICODE_PROPERTIES
|
#ifdef USE_UNICODE_PROPERTIES
|
||||||
/* 'Any': - */
|
/* 'Any': - */
|
||||||
static const OnigCodePoint CR_Any[] = {
|
static const OnigCodePoint CR_Any[] = {
|
||||||
|
@ -14969,7 +14968,6 @@ static const OnigCodePoint CR_Unknown[] = {
|
||||||
0xe01f0, 0x10ffff,
|
0xe01f0, 0x10ffff,
|
||||||
}; /* CR_Unknown */
|
}; /* CR_Unknown */
|
||||||
#endif /* USE_UNICODE_PROPERTIES */
|
#endif /* USE_UNICODE_PROPERTIES */
|
||||||
#endif /* USE_UNICODE_PROPERTIES */
|
|
||||||
|
|
||||||
/* 'Age_1_1': Derived Age 1.1 */
|
/* 'Age_1_1': Derived Age 1.1 */
|
||||||
static const OnigCodePoint CR_Age_1_1[] = {
|
static const OnigCodePoint CR_Age_1_1[] = {
|
||||||
|
@ -21972,7 +21970,6 @@ static const OnigCodePoint* const CodeRanges[] = {
|
||||||
CR_Word,
|
CR_Word,
|
||||||
CR_Alnum,
|
CR_Alnum,
|
||||||
CR_ASCII,
|
CR_ASCII,
|
||||||
#ifdef USE_UNICODE_PROPERTIES
|
|
||||||
#ifdef USE_UNICODE_PROPERTIES
|
#ifdef USE_UNICODE_PROPERTIES
|
||||||
CR_Any,
|
CR_Any,
|
||||||
CR_Assigned,
|
CR_Assigned,
|
||||||
|
@ -22173,7 +22170,6 @@ static const OnigCodePoint* const CodeRanges[] = {
|
||||||
CR_Age_5_2,
|
CR_Age_5_2,
|
||||||
CR_Age_6_0,
|
CR_Age_6_0,
|
||||||
#endif /* USE_UNICODE_PROPERTIES */
|
#endif /* USE_UNICODE_PROPERTIES */
|
||||||
#endif /* USE_UNICODE_PROPERTIES */
|
|
||||||
};
|
};
|
||||||
struct uniname2ctype_struct {
|
struct uniname2ctype_struct {
|
||||||
int name, ctype;
|
int name, ctype;
|
||||||
|
|
|
@ -36,7 +36,6 @@ error "gperf generated tables don't work with this execution character set. Plea
|
||||||
|
|
||||||
#define long size_t
|
#define long size_t
|
||||||
|
|
||||||
#ifdef USE_UNICODE_PROPERTIES
|
|
||||||
#ifdef USE_UNICODE_PROPERTIES
|
#ifdef USE_UNICODE_PROPERTIES
|
||||||
/* 'Any': - */
|
/* 'Any': - */
|
||||||
static const OnigCodePoint CR_Any[] = {
|
static const OnigCodePoint CR_Any[] = {
|
||||||
|
@ -14969,7 +14968,6 @@ static const OnigCodePoint CR_Unknown[] = {
|
||||||
0xe01f0, 0x10ffff,
|
0xe01f0, 0x10ffff,
|
||||||
}; /* CR_Unknown */
|
}; /* CR_Unknown */
|
||||||
#endif /* USE_UNICODE_PROPERTIES */
|
#endif /* USE_UNICODE_PROPERTIES */
|
||||||
#endif /* USE_UNICODE_PROPERTIES */
|
|
||||||
|
|
||||||
/* 'Age_1_1': Derived Age 1.1 */
|
/* 'Age_1_1': Derived Age 1.1 */
|
||||||
static const OnigCodePoint CR_Age_1_1[] = {
|
static const OnigCodePoint CR_Age_1_1[] = {
|
||||||
|
@ -21972,7 +21970,6 @@ static const OnigCodePoint* const CodeRanges[] = {
|
||||||
CR_Word,
|
CR_Word,
|
||||||
CR_Alnum,
|
CR_Alnum,
|
||||||
CR_ASCII,
|
CR_ASCII,
|
||||||
#ifdef USE_UNICODE_PROPERTIES
|
|
||||||
#ifdef USE_UNICODE_PROPERTIES
|
#ifdef USE_UNICODE_PROPERTIES
|
||||||
CR_Any,
|
CR_Any,
|
||||||
CR_Assigned,
|
CR_Assigned,
|
||||||
|
@ -22173,7 +22170,6 @@ static const OnigCodePoint* const CodeRanges[] = {
|
||||||
CR_Age_5_2,
|
CR_Age_5_2,
|
||||||
CR_Age_6_0,
|
CR_Age_6_0,
|
||||||
#endif /* USE_UNICODE_PROPERTIES */
|
#endif /* USE_UNICODE_PROPERTIES */
|
||||||
#endif /* USE_UNICODE_PROPERTIES */
|
|
||||||
};
|
};
|
||||||
struct uniname2ctype_struct {
|
struct uniname2ctype_struct {
|
||||||
int name, ctype;
|
int name, ctype;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue