Merge branch 'master' into yotta_release

PelionIoT · Jul 5, 2017 · 6e29048 · 6e29048
2 parents 3c326d0 + 7c31aef
commit 6e29048
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,6 @@ test_coverage/
 **/*.info
 **/*~
 output/*
+
+# Yotta files
+.yotta.json
diff --git a/mbed-trace/mbed_trace.h b/mbed-trace/mbed_trace.h
@@ -408,7 +408,7 @@ char* mbed_trace_array(const uint8_t* buf, uint16_t len);
 #elif !defined(MBED_TRACE_DUMMIES_DEFINED)
 // define dummies, hiding the real functions
 #define MBED_TRACE_DUMMIES_DEFINED
-#define mbed_trace_init(...)                        ((void) 0)
+#define mbed_trace_init(...)                        ((int) 0)
 #define mbed_trace_free(...)                        ((void) 0)
 #define mbed_trace_buffer_sizes(...)                ((void) 0)
 #define mbed_trace_config_set(...)                  ((void) 0)

diff --git a/module.json b/module.json
@@ -1,6 +1,6 @@
 {
   "name": "mbed-trace",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "Trace library for mbed devices",
   "keywords": [
     "trace",