]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a638871 715d081)
Merge branch 'bugfix/freertos_portmux_debug' into 'master'
authorIvan Grokhotkov <ivan@espressif.com>
Mon, 16 Oct 2017 20:44:04 +0000 (04:44 +0800)
committerIvan Grokhotkov <ivan@espressif.com>
Mon, 16 Oct 2017 20:44:04 +0000 (04:44 +0800)
freertos: fix compilation errors with portMUX debugging enabled

See merge request !1392

1  2 
components/freertos/include/freertos/portmacro.h patch | diff1 | diff2 | blob | history
components/freertos/port.c patch | diff1 | diff2 | blob | history
components/freertos/tasks.c patch | diff1 | diff2 | blob | history

diff --cc components/freertos/port.c
Simple merge
diff --cc components/freertos/tasks.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.