ruby-changes:21745
From: nobu <ko1@a...>
Date: Sun, 20 Nov 2011 04:03:54 +0900 (JST)
Subject: [ruby-changes:21745] nobu:r33793 (trunk): * Makefile.in (enc/unicode/name2ctype.h): remove duplicated
nobu 2011-11-20 04:01:49 +0900 (Sun, 20 Nov 2011) New Revision: 33793 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33793 Log: * Makefile.in (enc/unicode/name2ctype.h): remove duplicated ifdefs. Modified files: trunk/ChangeLog trunk/Makefile.in trunk/enc/unicode/name2ctype.h trunk/enc/unicode/name2ctype.h.blt Index: ChangeLog =================================================================== --- ChangeLog (revision 33792) +++ ChangeLog (revision 33793) @@ -1,3 +1,8 @@ +Sun Nov 20 04:01:45 2011 Nobuyoshi Nakada <nobu@r...> + + * Makefile.in (enc/unicode/name2ctype.h): remove duplicated + ifdefs. + Sat Nov 19 19:31:47 2011 Tanaka Akira <akr@f...> * time.c (TIME_COPY_GMT): copy vtm.utc_offset and vtm.zone too. Index: enc/unicode/name2ctype.h =================================================================== --- enc/unicode/name2ctype.h (revision 33792) +++ enc/unicode/name2ctype.h (revision 33793) @@ -37,7 +37,6 @@ #define long size_t #ifdef USE_UNICODE_PROPERTIES -#ifdef USE_UNICODE_PROPERTIES /* 'Any': - */ static const OnigCodePoint CR_Any[] = { 1, @@ -14969,7 +14968,6 @@ 0xe01f0, 0x10ffff, }; /* CR_Unknown */ #endif /* USE_UNICODE_PROPERTIES */ -#endif /* USE_UNICODE_PROPERTIES */ /* 'Age_1_1': Derived Age 1.1 */ static const OnigCodePoint CR_Age_1_1[] = { @@ -21973,7 +21971,6 @@ CR_Alnum, CR_ASCII, #ifdef USE_UNICODE_PROPERTIES -#ifdef USE_UNICODE_PROPERTIES CR_Any, CR_Assigned, CR_C, @@ -22173,7 +22170,6 @@ CR_Age_5_2, CR_Age_6_0, #endif /* USE_UNICODE_PROPERTIES */ -#endif /* USE_UNICODE_PROPERTIES */ }; struct uniname2ctype_struct { int name, ctype; Index: enc/unicode/name2ctype.h.blt =================================================================== --- enc/unicode/name2ctype.h.blt (revision 33792) +++ enc/unicode/name2ctype.h.blt (revision 33793) @@ -37,7 +37,6 @@ #define long size_t #ifdef USE_UNICODE_PROPERTIES -#ifdef USE_UNICODE_PROPERTIES /* 'Any': - */ static const OnigCodePoint CR_Any[] = { 1, @@ -14969,7 +14968,6 @@ 0xe01f0, 0x10ffff, }; /* CR_Unknown */ #endif /* USE_UNICODE_PROPERTIES */ -#endif /* USE_UNICODE_PROPERTIES */ /* 'Age_1_1': Derived Age 1.1 */ static const OnigCodePoint CR_Age_1_1[] = { @@ -21973,7 +21971,6 @@ CR_Alnum, CR_ASCII, #ifdef USE_UNICODE_PROPERTIES -#ifdef USE_UNICODE_PROPERTIES CR_Any, CR_Assigned, CR_C, @@ -22173,7 +22170,6 @@ CR_Age_5_2, CR_Age_6_0, #endif /* USE_UNICODE_PROPERTIES */ -#endif /* USE_UNICODE_PROPERTIES */ }; struct uniname2ctype_struct { int name, ctype; Index: Makefile.in =================================================================== --- Makefile.in (revision 33792) +++ Makefile.in (revision 33793) @@ -277,7 +277,7 @@ trap '$(RM) $@-1.h $@-2.h' 0 && \ set -x; \ 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 || :; \ $(MV) $@.tmp $@ && \ $(CP) $? $(?:.kwd=.src) && \ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/