diff options
| -rw-r--r-- | include/mruby.h | 3 | ||||
| -rw-r--r-- | mrbgems/mruby-bin-debugger/tools/mrdb/apistring.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/mruby.h b/include/mruby.h index 93aab5672..77f862356 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -44,6 +44,9 @@ #include <limits.h> #ifdef __cplusplus +#ifndef UINTPTR_MAX +#error Must be placed `#include <mruby.h>` before `#include <stdint.h>` +#endif #ifndef SIZE_MAX #ifdef __SIZE_MAX__ #define SIZE_MAX __SIZE_MAX__ diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/apistring.c b/mrbgems/mruby-bin-debugger/tools/mrdb/apistring.c index c3844b6d2..a7b320ade 100644 --- a/mrbgems/mruby-bin-debugger/tools/mrdb/apistring.c +++ b/mrbgems/mruby-bin-debugger/tools/mrdb/apistring.c @@ -9,7 +9,7 @@ static size_t mrb_debug_strnlen(const char *s, size_t maxlen) { - const char *p = memchr(s, '\0', maxlen); + const char *p = (const char*)memchr(s, '\0', maxlen); return p != NULL ? (size_t)(p - s) : maxlen; } @@ -17,7 +17,7 @@ char* mrdb_strndup(mrb_state *mrb, const char *s, size_t size) { size_t l = mrb_debug_strnlen(s, size); - char *d = mrb_malloc_simple(mrb, l + 1); + char *d = (char*)mrb_malloc_simple(mrb, l + 1); if (d != NULL) { memcpy(d, s, l); d[l] = '\0'; @@ -29,6 +29,6 @@ char* mrdb_strdup(mrb_state *mrb, const char *s) { size_t z = strlen(s) + 1; - char *d = mrb_malloc_simple(mrb, z); - return d != NULL ? memcpy(d, s, z) : NULL; + char *d = (char*)mrb_malloc_simple(mrb, z); + return d != NULL ? (char*)memcpy(d, s, z) : NULL; } |