diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-12-06 09:15:40 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-12-06 09:15:40 -0600 |
| commit | a07253bc5d925156e77bd5a0e149ecb4066ad2a8 (patch) | |
| tree | 4e3596ec55ce92fb4f1bd0a0de85c18ca6e13341 /apps | |
| parent | d992aae2de69af72c71c26fc06b870647b523279 (diff) | |
| parent | d1e79a541190c2177a81d7f958417d257477a379 (diff) | |
| download | nuttx-a07253bc5d925156e77bd5a0e149ecb4066ad2a8.tar.gz nuttx-a07253bc5d925156e77bd5a0e149ecb4066ad2a8.tar.bz2 nuttx-a07253bc5d925156e77bd5a0e149ecb4066ad2a8.zip | |
Merge remote-tracking branch 'origin/master' into traveller
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/examples/ostest/ostest.h | 4 | ||||
| -rw-r--r-- | apps/include/inifile.h | 2 | ||||
| -rw-r--r-- | apps/system/inifile/inifile.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/apps/examples/ostest/ostest.h b/apps/examples/ostest/ostest.h index 71d71c03a..55da611d1 100644 --- a/apps/examples/ostest/ostest.h +++ b/apps/examples/ostest/ostest.h @@ -143,6 +143,10 @@ void sem_test(void); void semtimed_test(void); +/* nsem.c *******************************************************************/ + +void nsem_test(void); + /* cond.c *******************************************************************/ void cond_test(void); diff --git a/apps/include/inifile.h b/apps/include/inifile.h index d2b88794d..bc8ca3a20 100644 --- a/apps/include/inifile.h +++ b/apps/include/inifile.h @@ -76,7 +76,7 @@ extern "C" * ****************************************************************************/ -INIHANDLE inifile_initialize(FAR char *inifile_name); +INIHANDLE inifile_initialize(FAR const char *inifile_name); /**************************************************************************** * Name: inifile_uninitialize diff --git a/apps/system/inifile/inifile.c b/apps/system/inifile/inifile.c index d82c4f127..a7bb8c0b1 100644 --- a/apps/system/inifile/inifile.c +++ b/apps/system/inifile/inifile.c @@ -500,7 +500,7 @@ static FAR char *inifile_find_variable(FAR struct inifile_state_s *priv, * ****************************************************************************/ -INIHANDLE inifile_initialize(FAR char *inifile_name) +INIHANDLE inifile_initialize(FAR const char *inifile_name) { /* Allocate an INI file parser state structure */ |