You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/05/24 23:53:23 UTC
incubator-mynewt-core git commit: imgmgr;
was not building if NFFS is not present.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 64aca16a6 -> f3a009f49
imgmgr; was not building if NFFS is not present.
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/f3a009f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/f3a009f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/f3a009f4
Branch: refs/heads/develop
Commit: f3a009f4900d4fd889decb1fe8c0f431330a3903
Parents: 64aca16
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Tue May 24 16:52:53 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Tue May 24 16:52:53 2016 -0700
----------------------------------------------------------------------
libs/imgmgr/src/imgmgr_boot.c | 2 --
libs/imgmgr/src/imgmgr_fs.c | 3 +--
2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f3a009f4/libs/imgmgr/src/imgmgr_boot.c
----------------------------------------------------------------------
diff --git a/libs/imgmgr/src/imgmgr_boot.c b/libs/imgmgr/src/imgmgr_boot.c
index 05cfa59..e678b74 100644
--- a/libs/imgmgr/src/imgmgr_boot.c
+++ b/libs/imgmgr/src/imgmgr_boot.c
@@ -27,8 +27,6 @@
#include <newtmgr/newtmgr.h>
#include <bootutil/image.h>
#include <bootutil/bootutil_misc.h>
-#include <fs/fs.h>
-#include <fs/fsutil.h>
#include <json/json.h>
#include <util/base64.h>
#include <hal/hal_bsp.h>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f3a009f4/libs/imgmgr/src/imgmgr_fs.c
----------------------------------------------------------------------
diff --git a/libs/imgmgr/src/imgmgr_fs.c b/libs/imgmgr/src/imgmgr_fs.c
index 9ca3c7b..0da77de 100644
--- a/libs/imgmgr/src/imgmgr_fs.c
+++ b/libs/imgmgr/src/imgmgr_fs.c
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+#ifdef FS_PRESENT
#include <os/os.h>
#include <os/endian.h>
@@ -34,7 +35,6 @@
#include "imgmgr/imgmgr.h"
#include "imgmgr_priv.h"
-#ifdef FS_PRESENT
int
imgr_file_download(struct nmgr_jbuf *njb)
{
@@ -234,5 +234,4 @@ err:
nmgr_jbuf_setoerr(njb, rc);
return 0;
}
-
#endif