diff options
Diffstat (limited to 'intl/localealias.c')
| -rw-r--r-- | intl/localealias.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/intl/localealias.c b/intl/localealias.c index 26122a0..b6fff1e 100644 --- a/intl/localealias.c +++ b/intl/localealias.c @@ -1,20 +1,18 @@ /* Handle aliases for locale names. - Copyright (C) 1995-1999, 2000-2001, 2003, 2005 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2001, 2003, 2005-2006 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/>. */ /* Tell glibc's <string.h> to provide a prototype for mempcpy(). This must come before <config.h> because <config.h> may include @@ -349,12 +347,14 @@ read_alias_file (const char *fname, int fname_len) string_space_max = new_size; } - map[nmap].alias = memcpy (&string_space[string_space_act], - alias, alias_len); + map[nmap].alias = + (const char *) memcpy (&string_space[string_space_act], + alias, alias_len); string_space_act += alias_len; - map[nmap].value = memcpy (&string_space[string_space_act], - value, value_len); + map[nmap].value = + (const char *) memcpy (&string_space[string_space_act], + value, value_len); string_space_act += value_len; ++nmap; |