alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'update/cbor' into 'master'

Browse Source 
Update tinycbor submodule in ESP-IDF

See merge request espressif/esp-idf!9271
This commit is contained in:
Mahavir Jain 2020-06-23 18:56:04 +08:00
commit dd703ef28a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/cbor/CMakeLists.txt
View File

@ -12,7 +12,7 @@ idf_component_register(SRCS "tinycbor/src/cborencoder_close_container_checked.c"
PRIV_INCLUDE_DIRS "tinycbor/src")
# for open_memstream.c
target_compile_definitions(${COMPONENT_LIB} PRIVATE "__GLIBC__")
set_source_files_properties(tinycbor/src/open_memstream.c PROPERTIES COMPILE_DEFINITIONS "__linux__")
# cbortojson.c:378:17: assignment discards 'const' qualifier from pointer target type
target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-discarded-qualifiers")

2
components/cbor/component.mk
View File

@ -3,6 +3,6 @@ COMPONENT_ADD_INCLUDEDIRS := port/include
COMPONENT_SRCDIRS := tinycbor/src
COMPONENT_PRIV_INCLUDEDIRS := tinycbor/src
tinycbor/src/open_memstream.o: CFLAGS += -D__GLIBC__
tinycbor/src/open_memstream.o: CFLAGS += -D__linux__
tinycbor/src/cbortojson.o: CFLAGS += -Wno-discarded-qualifiers
tinycbor/src/cborvalidation.o: CFLAGS += -Wno-maybe-uninitialized

2
components/cbor/tinycbor

@ -1 +1 @@
Subproject commit d2dd95cb8841d88d5a801e3ef9c328fd6200e7bd
Subproject commit 085ca40781f7c39febe6d14fb7e5cba342e1804b