diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-02 06:41:50 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-02 06:41:50 +0000 |
commit | db5d556f9b6ada9388fe73b925724a06eb23611b (patch) | |
tree | 02813ee6b1415cbf2ff1c427dfa4479be8399c2e /timev.h | |
parent | b8f8c20295a45ac7a473e2d0af4780d6702e6014 (diff) |
bit-fields other than int is a C99ism
To be precise C90 says "A bit-field may have type int, unsigned
int, or signed int". It is clear that char or enum are NG.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'timev.h')
-rw-r--r-- | timev.h | 25 |
1 files changed, 17 insertions, 8 deletions
@@ -1,20 +1,29 @@ #ifndef RUBY_TIMEV_H #define RUBY_TIMEV_H +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) +#define bits8_t uint8_t +#define bits16_t uint16_t +#else +#define bits8_t unsigned int +#define bits16_t unsigned int +#endif PACKED_STRUCT_UNALIGNED(struct vtm { VALUE year; /* 2000 for example. Integer. */ VALUE subsecx; /* 0 <= subsecx < TIME_SCALE. possibly Rational. */ VALUE utc_offset; /* -3600 as -01:00 for example. possibly Rational. */ const char *zone; /* "JST", "EST", "EDT", etc. */ - uint16_t yday:9; /* 1..366 */ - uint8_t mon:4; /* 1..12 */ - uint8_t mday:5; /* 1..31 */ - uint8_t hour:5; /* 0..23 */ - uint8_t min:6; /* 0..59 */ - uint8_t sec:6; /* 0..60 */ - uint8_t wday:3; /* 0:Sunday, 1:Monday, ..., 6:Saturday 7:init */ - uint8_t isdst:2; /* 0:StandardTime 1:DayLightSavingTime 3:init */ + bits16_t yday:9; /* 1..366 */ + bits8_t mon:4; /* 1..12 */ + bits8_t mday:5; /* 1..31 */ + bits8_t hour:5; /* 0..23 */ + bits8_t min:6; /* 0..59 */ + bits8_t sec:6; /* 0..60 */ + bits8_t wday:3; /* 0:Sunday, 1:Monday, ..., 6:Saturday 7:init */ + bits8_t isdst:2; /* 0:StandardTime 1:DayLightSavingTime 3:init */ }); +#undef bits8_t +#undef bits16_t #define TIME_SCALE 1000000000 |