Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-24 16:11:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merged in david_s5/nuttx/upstream_local_fix_to_greg (pull request #153)

Browse Source 
DO NOT MERGE Until Alan Verifies this -
This commit is contained in:
Gregory Nutt
2016-10-19 17:44:52 +00:00
parent 48fb97e7b5 b1ed7910f0
commit 8039173c9e
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/cxx/clocale
+1 -2
View File
@@ -46,11 +46,10 @@
// Namespace
//***************************************************************************
#ifdef CONFIG_LIBC_LOCALE
namespace std
{
using ::setlocale;
using ::localeconv;
}
#endif
#endif // __INCLUDE_CXX_CLOCALE
include/locale.h
-3
View File
@@ -43,8 +43,6 @@
#include <nuttx/config.h>
#include <nuttx/compiler.h>
#ifdef CONFIG_LIBC_LOCALE
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
@@ -109,5 +107,4 @@ FAR struct lconv *localeconv(void);
}
#endif
#endif /* CONFIG_LIBC_LOCALE */
#endif /* __INCLUDE_LOCALE_H */
libc/locale/lib_setlocale.c
+3 -2
View File
@@ -43,6 +43,7 @@
#include <locale.h>
#ifdef CONFIG_LIBC_LOCALE
#include <string.h>
/****************************************************************************
* Public Functions
@@ -62,8 +63,8 @@
FAR char *setlocale(int category, FAR const char *locale)
{
/* NULL indicates the the locale was not changed */
return NULL;
return ((strcmp (locale, "POSIX") == 0 || strcmp (locale, "C") == 0 ||
strcmp (locale, "") == 0) ? "C" : NULL);
}
#endif