diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-11 17:25:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-12 15:50:21 +0200 |
| commit | 6254b1f70e60af43b2b120ab8c07074f0ddc9d33 (patch) | |
| tree | 24c2ab6ad769c371c655397f0eebb0f3e1b77880 /hwpfilter | |
| parent | ec9b2600293f4910937e6e49c96c2797c9664abc (diff) | |
Get rid of _DATECODE_WEEK_DEFINES_
Change-Id: I1b50fadd64df0a18339410068696a836850e9248
Diffstat (limited to 'hwpfilter')
| -rw-r--r-- | hwpfilter/source/datecode.h | 23 | ||||
| -rw-r--r-- | hwpfilter/source/hbox.cxx | 22 |
2 files changed, 22 insertions, 23 deletions
diff --git a/hwpfilter/source/datecode.h b/hwpfilter/source/datecode.h index 89507b419157..e35b6e50a58f 100644 --- a/hwpfilter/source/datecode.h +++ b/hwpfilter/source/datecode.h @@ -24,28 +24,7 @@ static const hchar defaultform[] = { '1', 0x9165, 32, '2', 0xB6A9, 32, '3', 0xB7A9, 0 }; -#ifdef _DATECODE_WEEK_DEFINES_ -static const hchar kor_week[] = -{ - 0xB7A9, 0xB6A9, 0xD1C1, 0xAE81, 0xA1A2, 0x8B71, 0xC9A1 -}; -static const hchar china_week[] = -{ - 0x4CC8, 0x4BE4, 0x525A, 0x48D8, 0x45AB, 0x4270, 0x50B4 -}; -static const char eng_week[] = { "SunMonTueWedThuFriSat" }; -static const char eng_mon[] = { "JanFebMarAprMayJunJulAugSepOctNovDec" }; -static const char * const en_mon[] = -{ - "January", "February", "March", "April", "May", "June", "July", - "August", "September", "October", "November", "December" -}; -static const char * const en_week[] = -{ - "Sunday", "Monday", "Tuesday", "Wednesday", - "Thursday", "Friday", "Saturday" -}; -#endif //_DATECODE_WEEK_DEFINES_ + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx index beef2014327a..e501949ace73 100644 --- a/hwpfilter/source/hbox.cxx +++ b/hwpfilter/source/hbox.cxx @@ -138,9 +138,29 @@ DateCode::DateCode() { } -#define _DATECODE_WEEK_DEFINES_ #include "datecode.h" +static const hchar kor_week[] = +{ + 0xB7A9, 0xB6A9, 0xD1C1, 0xAE81, 0xA1A2, 0x8B71, 0xC9A1 +}; +static const hchar china_week[] = +{ + 0x4CC8, 0x4BE4, 0x525A, 0x48D8, 0x45AB, 0x4270, 0x50B4 +}; +static const char eng_week[] = { "SunMonTueWedThuFriSat" }; +static const char eng_mon[] = { "JanFebMarAprMayJunJulAugSepOctNovDec" }; +static const char * const en_mon[] = +{ + "January", "February", "March", "April", "May", "June", "July", + "August", "September", "October", "November", "December" +}; +static const char * const en_week[] = +{ + "Sunday", "Monday", "Tuesday", "Wednesday", + "Thursday", "Friday", "Saturday" +}; + hchar_string DateCode::GetString() { hchar_string ret; |