Fixed dbor includes. not all of them had tinycbor/ in them
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/5d1984c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/5d1984c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/5d1984c3 Branch: refs/heads/develop Commit: 5d1984c334e41231e3b4a8a9b0d7be6e066e1f1e Parents: dcbe3c1 Author: David G. Simmons <[email protected]> Authored: Tue Dec 20 10:35:06 2016 -0500 Committer: David G. Simmons <[email protected]> Committed: Tue Dec 20 10:35:06 2016 -0500 ---------------------------------------------------------------------- encoding/tinycbor/src/cborencoder.c | 8 ++++---- .../tinycbor/src/cborencoder_close_container_checked.c | 10 +++++----- encoding/tinycbor/src/cborerrorstrings.c | 2 +- encoding/tinycbor/src/cborparser.c | 10 +++++----- encoding/tinycbor/src/cborparser_dup_string.c | 2 +- encoding/tinycbor/src/cborpretty.c | 6 +++--- encoding/tinycbor/src/cbortojson.c | 8 ++++---- encoding/tinycbor/src/open_memstream.c | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5d1984c3/encoding/tinycbor/src/cborencoder.c ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/src/cborencoder.c b/encoding/tinycbor/src/cborencoder.c index cf4fbad..5e0e0a2 100644 --- a/encoding/tinycbor/src/cborencoder.c +++ b/encoding/tinycbor/src/cborencoder.c @@ -28,15 +28,15 @@ # define __STDC_LIMIT_MACROS 1 #endif -#include "cbor.h" -#include "cborconstants_p.h" -#include "compilersupport_p.h" +#include "tinycbor/cbor.h" +#include "tinycbor/cborconstants_p.h" +#include "tinycbor/compilersupport_p.h" #include <assert.h> #include <stdlib.h> #include <string.h> -#include "assert_p.h" /* Always include last */ +#include "tinycbor/assert_p.h" /* Always include last */ /** * \defgroup CborEncoding Encoding to CBOR http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5d1984c3/encoding/tinycbor/src/cborencoder_close_container_checked.c ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/src/cborencoder_close_container_checked.c b/encoding/tinycbor/src/cborencoder_close_container_checked.c index bcf77d6..59cefe5 100644 --- a/encoding/tinycbor/src/cborencoder_close_container_checked.c +++ b/encoding/tinycbor/src/cborencoder_close_container_checked.c @@ -28,14 +28,14 @@ # define __STDC_LIMIT_MACROS 1 #endif -#include "cbor.h" -#include "cborconstants_p.h" -#include "compilersupport_p.h" -#include "extract_number_p.h" +#include "tinycbor/cbor.h" +#include "tinycbor/cborconstants_p.h" +#include "tinycbor/compilersupport_p.h" +#include "tinycbor/extract_number_p.h" #include <assert.h> -#include "assert_p.h" /* Always include last */ +#include "tinycbor/assert_p.h" /* Always include last */ /** * \addtogroup CborEncoding http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5d1984c3/encoding/tinycbor/src/cborerrorstrings.c ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/src/cborerrorstrings.c b/encoding/tinycbor/src/cborerrorstrings.c index d2fe42f..b35d2d4 100644 --- a/encoding/tinycbor/src/cborerrorstrings.c +++ b/encoding/tinycbor/src/cborerrorstrings.c @@ -22,7 +22,7 @@ ** ****************************************************************************/ -#include "cbor.h" +#include "tinycbor/cbor.h" #ifndef _ # define _(msg) msg http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5d1984c3/encoding/tinycbor/src/cborparser.c ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/src/cborparser.c b/encoding/tinycbor/src/cborparser.c index ca7ddb7..08fe883 100644 --- a/encoding/tinycbor/src/cborparser.c +++ b/encoding/tinycbor/src/cborparser.c @@ -28,16 +28,16 @@ # define __STDC_LIMIT_MACROS 1 #endif -#include "cbor.h" -#include "cborconstants_p.h" -#include "compilersupport_p.h" -#include "extract_number_p.h" +#include "tinycbor/cbor.h" +#include "tinycbor/cborconstants_p.h" +#include "tinycbor/compilersupport_p.h" +#include "tinycbor/extract_number_p.h" #include <assert.h> #include <string.h> #include <tinycbor/cbor_buf_reader.h> -#include "assert_p.h" /* Always include last */ +#include "tinycbor/assert_p.h" /* Always include last */ #ifndef CBOR_PARSER_MAX_RECURSIONS # define CBOR_PARSER_MAX_RECURSIONS 1024 http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5d1984c3/encoding/tinycbor/src/cborparser_dup_string.c ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/src/cborparser_dup_string.c b/encoding/tinycbor/src/cborparser_dup_string.c index 60dbdbe..4ea1507 100644 --- a/encoding/tinycbor/src/cborparser_dup_string.c +++ b/encoding/tinycbor/src/cborparser_dup_string.c @@ -28,7 +28,7 @@ # define __STDC_LIMIT_MACROS 1 #endif -#include "cbor.h" +#include "tinycbor/cbor.h" #include <stdlib.h> /** http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5d1984c3/encoding/tinycbor/src/cborpretty.c ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/src/cborpretty.c b/encoding/tinycbor/src/cborpretty.c index b4335a7..ca81d95 100644 --- a/encoding/tinycbor/src/cborpretty.c +++ b/encoding/tinycbor/src/cborpretty.c @@ -28,9 +28,9 @@ # define __STDC_LIMIT_MACROS 1 #endif -#include "cbor.h" -#include "compilersupport_p.h" -#include "math_support_p.h" +#include "tinycbor/cbor.h" +#include "tinycbor/compilersupport_p.h" +#include "tinycbor/math_support_p.h" #include <float.h> #include <inttypes.h> http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5d1984c3/encoding/tinycbor/src/cbortojson.c ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/src/cbortojson.c b/encoding/tinycbor/src/cbortojson.c index b8e116f..572d440 100644 --- a/encoding/tinycbor/src/cbortojson.c +++ b/encoding/tinycbor/src/cbortojson.c @@ -30,10 +30,10 @@ # define __STDC_LIMIT_MACROS 1 #endif -#include "cbor.h" -#include "cborjson.h" -#include "compilersupport_p.h" -#include "math_support_p.h" +#include "tinycbor/cbor.h" +#include "tinycbor/cborjson.h" +#include "tinycbor/compilersupport_p.h" +#include "tinycbor/math_support_p.h" #include <float.h> #include <inttypes.h> http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5d1984c3/encoding/tinycbor/src/open_memstream.c ---------------------------------------------------------------------- diff --git a/encoding/tinycbor/src/open_memstream.c b/encoding/tinycbor/src/open_memstream.c index eaa53e5..f68b323 100644 --- a/encoding/tinycbor/src/open_memstream.c +++ b/encoding/tinycbor/src/open_memstream.c @@ -47,7 +47,7 @@ typedef size_t LenType; # error "Cannot implement open_memstream!" #endif -#include "compilersupport_p.h" +#include "tinycbor/compilersupport_p.h" struct Buffer {
