diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-04-27 08:56:39 -0700 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-04-27 08:56:39 -0700 |
| commit | 2b6be163082927ecdfa203b68639a8ff303469e6 (patch) | |
| tree | 43b1b48dd938f508bc9c6e71f273a17cf7764f7a /include | |
| parent | fdd4920ffdf098fd245079d6c0a881c42b776971 (diff) | |
| parent | f9647592ef940271ff2c45ef2c1e42989646cdb7 (diff) | |
| download | mruby-2b6be163082927ecdfa203b68639a8ff303469e6.tar.gz mruby-2b6be163082927ecdfa203b68639a8ff303469e6.zip | |
Merge pull request #61 from pbhogan/fix-warnings
Fix various warnings
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby/dump.h | 2 | ||||
| -rw-r--r-- | include/mruby/khash.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/mruby/dump.h b/include/mruby/dump.h index 1f211aa0b..1bdd9b91e 100644 --- a/include/mruby/dump.h +++ b/include/mruby/dump.h @@ -11,7 +11,7 @@ int mrb_dump_irep(mrb_state*,int,FILE*); int mrb_load_irep(mrb_state*,FILE*); int mrb_load_irep_offset(mrb_state*,FILE*,long); -int mrb_read_irep(mrb_state*,char*); +int mrb_read_irep(mrb_state*,const char*); int mrb_bdump_irep(mrb_state *mrb, int n, FILE *f,const char *initname); diff --git a/include/mruby/khash.h b/include/mruby/khash.h index a17db425a..6f369a455 100644 --- a/include/mruby/khash.h +++ b/include/mruby/khash.h @@ -108,7 +108,6 @@ static uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; while( new_n_buckets < limit ) new_n_buckets *= 2; \ } \ uint8_t *old_e_flags = h->e_flags; \ - uint8_t *old_d_flags = h->d_flags; \ khkey_t *old_keys = h->keys; \ khval_t *old_vals = h->vals; \ khint_t old_n_buckets = h->n_buckets; \ @@ -168,7 +167,7 @@ static uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; #define kh_destroy(name, h) kh_destroy_##name(h) #define kh_clear(name, h) kh_clear_##name(h) #define kh_resize(name, h, s) kh_resize_##name(h, s) -#define kh_put(name, h, k, r) kh_put_##name(h, k) +#define kh_put(name, h, k) kh_put_##name(h, k) #define kh_get(name, h, k) kh_get_##name(h, k) #define kh_del(name, h, k) kh_del_##name(h, k) #define kh_debug(name, h) kh_debug_##name(h) |