diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/mrbconf.h | 16 | ||||
| -rw-r--r-- | include/mruby/dump.h | 2 | ||||
| -rw-r--r-- | include/mruby/numeric.h | 2 |
3 files changed, 9 insertions, 11 deletions
diff --git a/include/mrbconf.h b/include/mrbconf.h index 988bdf0ad..bd8f6ea80 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -111,14 +111,6 @@ typedef short mrb_sym; #define DISABLE_DEBUG #endif -#ifndef FALSE -# define FALSE 0 -#endif - -#ifndef TRUE -# define TRUE 1 -#endif - #ifdef _MSC_VER # include <float.h> # define inline __inline @@ -154,4 +146,12 @@ typedef _Bool mrb_bool; # include <stdio.h> #endif +#ifndef FALSE +# define FALSE 0 +#endif + +#ifndef TRUE +# define TRUE 1 +#endif + #endif /* MRUBYCONF_H */ diff --git a/include/mruby/dump.h b/include/mruby/dump.h index f65cd5671..2533a4c93 100644 --- a/include/mruby/dump.h +++ b/include/mruby/dump.h @@ -18,7 +18,7 @@ int mrb_dump_irep_binary(mrb_state*, size_t, int, FILE*); int mrb_dump_irep_cfunc(mrb_state *mrb, size_t n, int, FILE *f, const char *initname); int32_t mrb_read_irep_file(mrb_state*, FILE*); #endif -int mrb_read_irep(mrb_state*, const uint8_t*); +int32_t mrb_read_irep(mrb_state*, const uint8_t*); #ifdef ENABLE_STDIO mrb_value mrb_load_irep_file(mrb_state*,FILE*); diff --git a/include/mruby/numeric.h b/include/mruby/numeric.h index 9a5ba449f..4bcb43966 100644 --- a/include/mruby/numeric.h +++ b/include/mruby/numeric.h @@ -11,8 +11,6 @@ extern "C" { #endif -#include <limits.h> - #define POSFIXABLE(f) ((f) <= MRB_INT_MAX) #define NEGFIXABLE(f) ((f) >= MRB_INT_MIN) #define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f)) |