Windows: fix utime_mphal compilation, add ticks_cpu #2586
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dpgeorge
reviewed
Nov 2, 2016
| @@ -152,6 +152,9 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = { | |||
| { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mod_time_time_obj) }, | |||
| { MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mp_utime_ticks_ms_obj) }, | |||
| { MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mp_utime_ticks_us_obj) }, | |||
| #ifdef _WIN32 | |||
| { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_utime_ticks_cpu_obj) }, | |||
| #endif | |||
There was a problem hiding this comment.
To reduce the number of #if's we should just have this line added for both unix and windows, ie without the #ifdef. It'll still compile but on unix ticks_cpu() will return 0. That's fine for now, it can be implemented later.
stinos
force-pushed
the
windows-utime-mphal
branch
from
3827c0d
to
143b567
Compare
stinos
force-pushed
the
windows-utime-mphal
branch
from
143b567
to
3272afe
Compare
|
Thank you. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.