diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-24 00:44:28 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-24 00:44:28 +0900 |
| commit | e69a13a20e0f145de644d1e229280713fe91cf6f (patch) | |
| tree | 26503e78864d41062aaa3c53c1f55cc72cf50993 /include | |
| parent | 6954153fa06630aa9aaf642f8f1221cddb01793a (diff) | |
| parent | f719b0e7fff2d4754d91826b69d142c66635c3cf (diff) | |
| download | mruby-e69a13a20e0f145de644d1e229280713fe91cf6f.tar.gz mruby-e69a13a20e0f145de644d1e229280713fe91cf6f.zip | |
resolve conflict
Diffstat (limited to 'include')
| -rw-r--r-- | include/mrbconf.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/include/mrbconf.h b/include/mrbconf.h index a6914cdb4..0caa3f90e 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -77,6 +77,11 @@ typedef int64_t mrb_int; # define MRB_INT_MIN INT64_MIN # define MRB_INT_MAX INT64_MAX +# define PRIdMRB_INT PRId64 +# define PRIiMRB_INT PRIi64 +# define PRIoMRB_INT PRIo64 +# define PRIxMRB_INT PRIx64 +# define PRIXMRB_INT PRIX64 # define str_to_mrb_int(buf) strtoll(buf, NULL, 10) # endif #elif defined(MRB_INT16) @@ -88,6 +93,11 @@ typedef int32_t mrb_int; # define MRB_INT_MIN INT32_MIN # define MRB_INT_MAX INT32_MAX +# define PRIdMRB_INT PRId32 +# define PRIiMRB_INT PRIi32 +# define PRIoMRB_INT PRIo32 +# define PRIxMRB_INT PRIx32 +# define PRIXMRB_INT PRIX32 # define str_to_mrb_int(buf) strtol(buf, NULL, 10) #endif typedef short mrb_sym; @@ -116,7 +126,15 @@ typedef short mrb_sym; # define isinf(n) (!_finite(n) && !_isnan(n)) # define strtoll _strtoi64 # define PRId32 "I32d" +# define PRIi32 "I32i" +# define PRIo32 "I32o" +# define PRIx32 "I32x" +# define PRIX32 "I32X" # define PRId64 "I64d" +# define PRIi64 "I64i" +# define PRIo64 "I64o" +# define PRIx64 "I64x" +# define PRIX64 "I64X" # ifdef __cplusplus typedef bool mrb_bool; # else |