diff options
| author | mimaki <[email protected]> | 2012-04-20 16:57:43 +0900 |
|---|---|---|
| committer | mimaki <[email protected]> | 2012-04-20 16:57:43 +0900 |
| commit | 4be3ca52090c6e3fde54c9678079eb1c02fc6862 (patch) | |
| tree | 02d2b13e8496df1f227ca2c4855f121d12d0fc20 /include | |
| parent | d67cd99b47a57dc3bf28af0b3bdc42d2eb887f03 (diff) | |
| parent | dc2c98ab4c01135bee7349bd364535f6d3d211e6 (diff) | |
| download | mruby-4be3ca52090c6e3fde54c9678079eb1c02fc6862.tar.gz mruby-4be3ca52090c6e3fde54c9678079eb1c02fc6862.zip | |
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby.h | 3 | ||||
| -rw-r--r-- | include/mruby/object.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/mruby.h b/include/mruby.h index 506158d3c..123f802ad 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -441,11 +441,14 @@ void mrb_bug(const char *fmt, ...); #ifdef __GNUC__ # define NUM2CHR(x) __extension__ ({mrb_value num2chr_x = (x); NUM2CHR_internal(num2chr_x);}) #else +/* TODO: there is no definitions of RSTRING_* here, so cannot compile. static inline char NUM2CHR(mrb_value x) { return NUM2CHR_internal(x); } +*/ +#define NUM2CHR(x) NUM2CHR_internal(x) #endif mrb_value mrb_io_gets(mrb_state *mrb, mrb_value); mrb_value mrb_io_getbyte(mrb_state *mrb, mrb_value); diff --git a/include/mruby/object.h b/include/mruby/object.h index 151e36b96..e73ebe79a 100644 --- a/include/mruby/object.h +++ b/include/mruby/object.h @@ -6,7 +6,7 @@ int color:3;\ unsigned int flags:21;\ struct RClass *c;\ - struct RBasic *gcnext; + struct RBasic *gcnext /* white: 011, black: 100, gray: 000 */ |