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/03/29 02:40:50 UTC

[05/15] incubator-mynewt-core git commit: Can't have local preprocessor flags in public header files.

Can't have local preprocessor flags in public header files.


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/e58a97e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/e58a97e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/e58a97e5

Branch: refs/heads/develop
Commit: e58a97e5951a4d0fd331dde5ca71a4f63af92747
Parents: 72d8afa
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Mon Mar 28 07:59:25 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Mon Mar 28 17:37:31 2016 -0700

----------------------------------------------------------------------
 sys/config/include/config/config_fcb.h  | 5 -----
 sys/config/include/config/config_file.h | 7 ++-----
 2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e58a97e5/sys/config/include/config/config_fcb.h
----------------------------------------------------------------------
diff --git a/sys/config/include/config/config_fcb.h b/sys/config/include/config/config_fcb.h
index d170a6f..91b4076 100644
--- a/sys/config/include/config/config_fcb.h
+++ b/sys/config/include/config/config_fcb.h
@@ -19,9 +19,6 @@
 #ifndef __SYS_CONFIG_FCB_H_
 #define __SYS_CONFIG_FCB_H_
 
-#ifdef FCB_PRESENT
-
-#include <fcb/fcb.h>
 #include "config/config.h"
 
 struct conf_fcb {
@@ -32,6 +29,4 @@ struct conf_fcb {
 int conf_fcb_src(struct conf_fcb *fcb);
 int conf_fcb_dst(struct conf_fcb *fcb);
 
-#endif
-
 #endif /* __SYS_CONFIG_FCB_H_ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e58a97e5/sys/config/include/config/config_file.h
----------------------------------------------------------------------
diff --git a/sys/config/include/config/config_file.h b/sys/config/include/config/config_file.h
index 8ccfdc0..73d4a3a 100644
--- a/sys/config/include/config/config_file.h
+++ b/sys/config/include/config/config_file.h
@@ -19,12 +19,11 @@
 #ifndef __SYS_CONFIG_FILE_H_
 #define __SYS_CONFIG_FILE_H_
 
-#ifdef FS_PRESENT
-
-#include <fs/fs.h>
 #include "config/config.h"
 
 #define CONF_FILE_NAME_MAX	32	/* max length for config filename */
+
+struct fs_file;
 struct conf_file {
     struct conf_store cf_store;
     const char *cf_name;
@@ -34,6 +33,4 @@ struct conf_file {
 int conf_file_src(struct conf_file *);  /* register file to be source of cfg */
 int conf_file_dst(struct conf_file *);  /* cfg saves go to a file */
 
-#endif
-
 #endif /* __SYS_CONFIG_FILE_H_ */