Commit a44532c
authored
Rollup merge of #100119 - ivmarkov:master, r=joshtriplett
FilesTimes support does not build for ESP-IDF
Commit 1f5d8d4 broke STD for `target_os = "espidf"`.
In future, we might come up with something more sophisticated (as in using the `utime` function which *is* available on the ESP-IDF platform), but for now we are treating ESP-IDF just like `Redox` in that the new API fails at runtime. Most important for us ATM is to restore successful compilation of STD on our platform.1 file changed
+7
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
544 | 544 | | |
545 | 545 | | |
546 | 546 | | |
547 | | - | |
| 547 | + | |
| 548 | + | |
| 549 | + | |
548 | 550 | | |
549 | | - | |
| 551 | + | |
550 | 552 | | |
551 | 553 | | |
552 | 554 | | |
| |||
1077 | 1079 | | |
1078 | 1080 | | |
1079 | 1081 | | |
1080 | | - | |
| 1082 | + | |
1081 | 1083 | | |
| 1084 | + | |
| 1085 | + | |
1082 | 1086 | | |
1083 | 1087 | | |
1084 | 1088 | | |
| |||
0 commit comments