diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-12-02 15:44:32 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-12-02 15:44:32 +0900 |
| commit | ea828944eff14b0cc3be88c432499602bd454c75 (patch) | |
| tree | 8caa110cabf5b1376ac21fd8ad5637e9b4b89860 | |
| parent | 4c70b5c644a1f936ac4790ab437cf76a99fb8aa8 (diff) | |
| parent | 64d1d104928336dc0cd9c67321617fa455ccac62 (diff) | |
| download | mruby-ea828944eff14b0cc3be88c432499602bd454c75.tar.gz mruby-ea828944eff14b0cc3be88c432499602bd454c75.zip | |
Merge branch 'master' of github.com:mruby/mruby
| -rw-r--r-- | include/mruby.h | 2 | ||||
| -rwxr-xr-x | mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/mruby.h b/include/mruby.h index 5b8d08b5b..68b0c5b79 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -359,7 +359,7 @@ MRB_API mrb_value mrb_obj_clone(mrb_state *mrb, mrb_value self); #define ISALPHA(c) (ISASCII(c) && isalpha((int)(unsigned char)(c))) #define ISDIGIT(c) (ISASCII(c) && isdigit((int)(unsigned char)(c))) #define ISXDIGIT(c) (ISASCII(c) && isxdigit((int)(unsigned char)(c))) -#define ISBLANK(c) (ISASCII(c) && isblank((int)(unsigned char)(c))) +#define ISBLANK(c) (ISASCII(c) && ((c) == ' ' || (c) == '\t')) #define ISCNTRL(c) (ISASCII(c) && iscntrl((int)(unsigned char)(c))) #define TOUPPER(c) (ISASCII(c) ? toupper((int)(unsigned char)(c)) : (c)) #define TOLOWER(c) (ISASCII(c) ? tolower((int)(unsigned char)(c)) : (c)) diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c index 9764d4e07..9759badfe 100755 --- a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c +++ b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c @@ -58,9 +58,11 @@ print_api_common_error(int32_t error) } #undef STRTOUL -#define STRTOUL(ul,s) \ +#define STRTOUL(ul,s) { \ + int i; \ ul = 0; \ - for(int i=0; ISDIGIT(s[i]); i++) ul = 10*ul + (s[i] -'0'); + for(i=0; ISDIGIT(s[i]); i++) ul = 10*ul + (s[i] -'0'); \ +} static int32_t parse_breakpoint_no(char* args) |