You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2019/12/16 14:41:11 UTC

[GitHub] [mynewt-mcumgr] de-nordic commented on a change in pull request #46: Zephyr support

de-nordic commented on a change in pull request #46: Zephyr support
URL: https://github.com/apache/mynewt-mcumgr/pull/46#discussion_r358269467
 
 

 ##########
 File path: cborattr/src/cborattr.c
 ##########
 @@ -17,24 +17,29 @@
  * under the License.
  */
 
-//#include <syscfg/syscfg.h>
 #include "cborattr/cborattr.h"
 #include "tinycbor/cbor.h"
 #include "tinycbor/cbor_buf_reader.h"
 
+#ifdef __ZEPHYR__
+#include <zephyr.h>
+<<<<<<< Updated upstream
 
 Review comment:
   I think you left this by accident.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services