Merge branch 'master' of ssh://git.code.sf.net/p/nuttx/git

This commit is contained in:
Gregory Nutt 2014-12-07 12:32:10 -06:00
commit f1e008c2f3
3 changed files with 6 additions and 2 deletions

View File

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

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

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 */