kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

bit-fields other than int is a C99ism

Browse source 
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
This commit is contained in:
shyouhei 2018-01-02 06:41:50 +00:00
parent b8f8c20295
commit db5d556f9b
4 changed files with 37 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compile.c
View file

@ -7985,7 +7985,11 @@ struct ibf_id_entry {
ibf_id_enc_ascii,
ibf_id_enc_utf8,
ibf_id_enc_other
} enc : 2;
} enc
#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
: 2
#endif
;
char body[1];
};

8
method.h
View file

@ -32,10 +32,16 @@ typedef enum {
METHOD_VISI_MASK = 0x03
} rb_method_visibility_t;
#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
#define bits_t rb_method_visibility_t
#else
#define bits_t unsigned int
#endif
typedef struct rb_scope_visi_struct {
rb_method_visibility_t method_visi : 3;
bits_t method_visi : 3;
unsigned int module_func : 1;
} rb_scope_visibility_t;
#undef bits_t
/*! CREF (Class REFerence) */
typedef struct rb_cref_struct {

10
time.c
View file

@ -1596,12 +1596,18 @@ localtimew(wideval_t timew, struct vtm *result)
return result;
}
#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
#define bits_t uint8_t
#else
#define bits_t unsigned int
#endif
PACKED_STRUCT_UNALIGNED(struct time_object {
wideval_t timew; /* time_t value * TIME_SCALE. possibly Rational. */
struct vtm vtm;
uint8_t gmt:3; /* 0:localtime 1:utc 2:fixoff 3:init */
uint8_t tm_got:1;
bits_t gmt:3; /* 0:localtime 1:utc 2:fixoff 3:init */
bits_t tm_got:1;
});
#undef bits_t
#define GetTimeval(obj, tobj) ((tobj) = get_timeval(obj))
#define GetNewTimeval(obj, tobj) ((tobj) = get_new_timeval(obj))

25
timev.h
View file

@ -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