Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
17240422
Commit
17240422
authored
Jan 29, 2013
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #766 from masuidrive/mrbint64
Fixed MRB_INT64 warning
parents
e18a9c0a
5a681874
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
7 deletions
+14
-7
include/mrbconf.h
include/mrbconf.h
+13
-6
src/cdump.c
src/cdump.c
+1
-1
No files found.
include/mrbconf.h
View file @
17240422
...
@@ -76,7 +76,8 @@
...
@@ -76,7 +76,8 @@
typedef
int32_t
mrb_int
;
typedef
int32_t
mrb_int
;
# define MRB_INT_MIN INT32_MIN
# define MRB_INT_MIN INT32_MIN
# define MRB_INT_MAX INT32_MAX
# define MRB_INT_MAX INT32_MAX
# define mrb_int_to_str(buf, i) sprintf((buf), "%d", (i))
# define MRB_INT_FORMAT PRId32
# define mrb_int_to_str(buf, i) sprintf((buf), "%" MRB_INT_FORMAT, (i))
# define str_to_mrb_int(buf) (mrb_int)strtol((buf), NULL, 10)
# define str_to_mrb_int(buf) (mrb_int)strtol((buf), NULL, 10)
# endif
# endif
#else
#else
...
@@ -84,13 +85,15 @@
...
@@ -84,13 +85,15 @@
typedef
int64_t
mrb_int
;
typedef
int64_t
mrb_int
;
# define MRB_INT_MIN INT64_MIN
# define MRB_INT_MIN INT64_MIN
# define MRB_INT_MAX INT64_MAX
# define MRB_INT_MAX INT64_MAX
# define mrb_int_to_str(buf, i) sprintf((buf), "%ld", (i))
# define MRB_INT_FORMAT PRId64
# define mrb_int_to_str(buf, i) sprintf((buf), "%" MRB_INT_FORMAT, (i))
# define str_to_mrb_int(buf) (mrb_int)strtoll((buf), NULL, 10)
# define str_to_mrb_int(buf) (mrb_int)strtoll((buf), NULL, 10)
# else
# else
typedef
int
mrb_int
;
typedef
int32_t
mrb_int
;
# define MRB_INT_MIN INT_MIN
# define MRB_INT_MIN INT32_MIN
# define MRB_INT_MAX INT_MAX
# define MRB_INT_MAX INT32_MAX
# define mrb_int_to_str(buf, i) sprintf((buf), "%d", (i))
# define MRB_INT_FORMAT PRId32
# define mrb_int_to_str(buf, i) sprintf((buf), "%" MRB_INT_FORMAT, (i))
# define str_to_mrb_int(buf) (mrb_int)strtol((buf), NULL, 10)
# define str_to_mrb_int(buf) (mrb_int)strtol((buf), NULL, 10)
# endif
# endif
#endif
#endif
...
@@ -131,6 +134,10 @@ typedef short mrb_sym;
...
@@ -131,6 +134,10 @@ typedef short mrb_sym;
# define isnan _isnan
# define isnan _isnan
# define isinf(n) (!_finite(n) && !_isnan(n))
# define isinf(n) (!_finite(n) && !_isnan(n))
# define strtoll _strtoi64
# define strtoll _strtoi64
# define PRId32 "I32d"
# define PRId64 "I64d"
#else
# include <inttypes.h>
#endif
#endif
#endif
/* MRUBYCONF_H */
#endif
/* MRUBYCONF_H */
src/cdump.c
View file @
17240422
...
@@ -145,7 +145,7 @@ make_cdump_irep(mrb_state *mrb, int irep_no, FILE *f)
...
@@ -145,7 +145,7 @@ make_cdump_irep(mrb_state *mrb, int irep_no, FILE *f)
case
MRB_TT_FLOAT
:
case
MRB_TT_FLOAT
:
SOURCE_CODE
(
" irep->pool[%d] = mrb_float_value(%.16e);"
,
n
,
mrb_float
(
irep
->
pool
[
n
]));
break
;
SOURCE_CODE
(
" irep->pool[%d] = mrb_float_value(%.16e);"
,
n
,
mrb_float
(
irep
->
pool
[
n
]));
break
;
case
MRB_TT_FIXNUM
:
case
MRB_TT_FIXNUM
:
SOURCE_CODE
(
" irep->pool[%d] = mrb_fixnum_value(%
d);"
,
n
,
mrb_fixnum
(
irep
->
pool
[
n
]));
break
;
SOURCE_CODE
(
" irep->pool[%d] = mrb_fixnum_value(%
"
MRB_INT_FORMAT
");"
,
n
,
mrb_fixnum
(
irep
->
pool
[
n
]));
break
;
case
MRB_TT_STRING
:
case
MRB_TT_STRING
:
str_len
=
str_format_len
(
irep
->
pool
[
n
])
+
1
;
str_len
=
str_format_len
(
irep
->
pool
[
n
])
+
1
;
if
(
str_len
>
buf_len
)
{
if
(
str_len
>
buf_len
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment