diff options
| author | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-27 14:35:40 +0100 |
|---|---|---|
| committer | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-27 14:35:40 +0100 |
| commit | b1de003dac299705a7f01c997d2b866bafe39926 (patch) | |
| tree | 1cc16a3877e945116387a380f7f3023f81fa36e4 /lib/localename.h | |
| parent | 752fd7247bc223bcea35bd89cf56d1c08ead9ba6 (diff) | |
| parent | 3590c846d4c2febbc05b4ad6b14a06edc549e453 (diff) | |
Merge tag 'upstream/0.9.6+really0.9.6'
Upstream version 0.9.6+really0.9.6
Diffstat (limited to 'lib/localename.h')
| -rw-r--r-- | lib/localename.h | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/lib/localename.h b/lib/localename.h index bb7caee..8c94c9a 100644 --- a/lib/localename.h +++ b/lib/localename.h @@ -1,20 +1,18 @@ /* Determine name of the currently selected locale. - Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _GL_LOCALENAME_H #define _GL_LOCALENAME_H @@ -87,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 } |