You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/09/11 19:49:46 UTC
[1/2] incubator-mynewt-core git commit: Add missing include guards to
two headers.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop e993ac597 -> 61a210874
Add missing include guards to two headers.
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/df50b664
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/df50b664
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/df50b664
Branch: refs/heads/develop
Commit: df50b664a9ee93a6446271916e20f077cc09d7ce
Parents: e993ac5
Author: Christopher Collins <cc...@apache.org>
Authored: Sun Sep 11 12:46:11 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Sun Sep 11 12:46:11 2016 -0700
----------------------------------------------------------------------
libs/baselibc/src/baselibc_test/unittests.h | 24 +++++++++++++++++++++++-
libs/shell/include/shell/shell_prompt.h | 4 +++-
2 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/df50b664/libs/baselibc/src/baselibc_test/unittests.h
----------------------------------------------------------------------
diff --git a/libs/baselibc/src/baselibc_test/unittests.h b/libs/baselibc/src/baselibc_test/unittests.h
index c2b470a..572f595 100644
--- a/libs/baselibc/src/baselibc_test/unittests.h
+++ b/libs/baselibc/src/baselibc_test/unittests.h
@@ -1,3 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BASELIBC_UNITTESTS_
+#define H_BASELIBC_UNITTESTS_
+
#include <stdio.h>
#define COMMENT(x) printf("\n----" x "----\n");
@@ -11,4 +33,4 @@
printf("\033[32;1mOK:\033[22;39m " #x "\n"); \
}
-
+#endif
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/df50b664/libs/shell/include/shell/shell_prompt.h
----------------------------------------------------------------------
diff --git a/libs/shell/include/shell/shell_prompt.h b/libs/shell/include/shell/shell_prompt.h
index 2b6b2fa..f0e4dd3 100644
--- a/libs/shell/include/shell/shell_prompt.h
+++ b/libs/shell/include/shell/shell_prompt.h
@@ -17,7 +17,9 @@
* under the License.
*/
-
+#ifndef H_SHELL_PROMPT_
+#define H_SHELL_PROMPT_
int shell_prompt_cmd(int argc, char **argv);
+#endif
[2/2] incubator-mynewt-core git commit: Fix warning in json unit test.
Posted by cc...@apache.org.
Fix warning in json unit test.
test_json_simple.c: In function \u2018TEST_CASE_test_json_simple_decode\u2019:
test_json_simple.c:309:4: error: this decimal constant is unsigned only
in ISO C90 [-Werror]
TEST_ASSERT(uintarr[2] == 4294967295);
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/61a21087
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/61a21087
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/61a21087
Branch: refs/heads/develop
Commit: 61a210874945fc8eef2703cd878d7a2d6a2b2ef8
Parents: df50b66
Author: Christopher Collins <cc...@apache.org>
Authored: Sun Sep 11 12:49:24 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Sun Sep 11 12:49:24 2016 -0700
----------------------------------------------------------------------
libs/json/src/test/test_json_simple.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/61a21087/libs/json/src/test/test_json_simple.c
----------------------------------------------------------------------
diff --git a/libs/json/src/test/test_json_simple.c b/libs/json/src/test/test_json_simple.c
index 55d50f4..0f9e10e 100644
--- a/libs/json/src/test/test_json_simple.c
+++ b/libs/json/src/test/test_json_simple.c
@@ -306,9 +306,9 @@ TEST_CASE(test_json_simple_decode){
TEST_ASSERT(uintarr[0] == 0);
TEST_ASSERT(uintarr[1] == 65535);
- TEST_ASSERT(uintarr[2] == 4294967295);
- TEST_ASSERT(uintarr[3] == 8589934590);
- TEST_ASSERT(uintarr[4] == 3451257);
+ TEST_ASSERT(uintarr[2] == 4294967295ULL);
+ TEST_ASSERT(uintarr[3] == 8589934590ULL);
+ TEST_ASSERT(uintarr[4] == 3451257ULL);
/*testing arrays with empty spaces within the elements*/
struct json_attr_t test_boolspacearr[2] = {