sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into traveller

Browse Source
This commit is contained in:
Gregory Nutt 2014-12-06 09:15:40 -06:00
commit 390251a5f8
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/ostest/ostest.h
View File

@ -143,6 +143,10 @@ void sem_test(void);
void semtimed_test(void); void semtimed_test(void);
/* nsem.c *******************************************************************/
void nsem_test(void);
/* cond.c *******************************************************************/ /* cond.c *******************************************************************/
void cond_test(void); void cond_test(void);

2
include/inifile.h
View File

@ -76,7 +76,7 @@ extern "C"
* *
****************************************************************************/ ****************************************************************************/
INIHANDLE inifile_initialize(FAR char *inifile_name); INIHANDLE inifile_initialize(FAR const char *inifile_name);
/**************************************************************************** /****************************************************************************
* Name: inifile_uninitialize * Name: inifile_uninitialize

2
system/inifile/inifile.c
View File

@ -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 */ /* Allocate an INI file parser state structure */