diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/localename.c | 2 | ||||
| -rw-r--r-- | lib/localename.h | 8 |
3 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2014-07-10 Assaf Gordon <assafgordon@gmail.com> + + localename: avoid -Wsuggest-attribute={const,pure} warnings + * lib/localename.c (string_has): Tag internal function as pure. + * lib/localename.h (gl_locale_name_default): Tag extern declaration + as const when appropriate. + 2014-07-10 Eli Zaretskii <eliz@gnu.org> nl_langinfo: Fix last change. diff --git a/lib/localename.c b/lib/localename.c index faf3f92522..9b6f67c55c 100644 --- a/lib/localename.c +++ b/lib/localename.c @@ -2515,7 +2515,7 @@ gl_locale_name_from_win32_LCID (LCID lcid) /* A hash function for NUL-terminated char* strings using the method described by Bruno Haible. See http://www.haible.de/bruno/hashfunc.html. */ -static size_t +static size_t _GL_ATTRIBUTE_PURE string_hash (const void *x) { const char *s = (const char *) x; diff --git a/lib/localename.h b/lib/localename.h index c73dfa83a4..687f1dd4fb 100644 --- a/lib/localename.h +++ b/lib/localename.h @@ -85,8 +85,12 @@ extern const char * gl_locale_name_environ (int category, const char *categoryna not require such a facility." The result must not be freed; it is statically allocated. */ -extern const char * gl_locale_name_default (void); - +extern const char * gl_locale_name_default (void) +#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE \ + || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__) + _GL_ATTRIBUTE_CONST +#endif + ; #ifdef __cplusplus } |