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
87d1b2a9
Commit
87d1b2a9
authored
Jul 22, 2019
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve conflict error message of `Time` and `Math`; ref #4576
parent
949f6f53
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
mrbgems/mruby-math/src/math.c
mrbgems/mruby-math/src/math.c
+1
-1
mrbgems/mruby-time/src/time.c
mrbgems/mruby-time/src/time.c
+1
-1
No files found.
mrbgems/mruby-math/src/math.c
View file @
87d1b2a9
...
...
@@ -5,7 +5,7 @@
*/
#ifdef MRB_WITHOUT_FLOAT
# error
Conflict
'MRB_WITHOUT_FLOAT' configuration in your 'build_config.rb'
# error
Math conflicts
'MRB_WITHOUT_FLOAT' configuration in your 'build_config.rb'
#endif
#include <mruby.h>
...
...
mrbgems/mruby-time/src/time.c
View file @
87d1b2a9
...
...
@@ -5,7 +5,7 @@
*/
#ifdef MRB_WITHOUT_FLOAT
# error
Conflict
'MRB_WITHOUT_FLOAT' configuration in your 'build_config.rb'
# error
Time conflicts
'MRB_WITHOUT_FLOAT' configuration in your 'build_config.rb'
#endif
#include <math.h>
...
...
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