From: Bruno Haible Date: Mon, 3 Mar 2003 18:55:08 +0000 (+0000) Subject: Change copyright to LGPL. Make it callable from C++. X-Git-Tag: v0.12~166 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1e40ccec9d2e8f2c99eb6aa8450b0b0954df369;p=thirdparty%2Fgettext.git Change copyright to LGPL. Make it callable from C++. --- diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 10a354f4a..ae8decfd4 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,9 @@ +2003-02-28 Bruno Haible + + * localcharset.h: Change copyright to LGPL. Enclose declaration in + extern "C", for C++ compilers. + * localcharset.c: Drop C linkage declaration. + 2003-02-18 Bruno Haible * Makefile.in (LTV_CURRENT, LTV_REVISION, LTV_AGE): Bump to 5:0:3. diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c index dad97308c..6676e8b50 100644 --- a/gettext-runtime/intl/localcharset.c +++ b/gettext-runtime/intl/localcharset.c @@ -1,6 +1,6 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2002 Free Software Foundation, Inc. + Copyright (C) 2000-2003 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 @@ -85,11 +85,6 @@ # define getc getc_unlocked #endif -#ifdef __cplusplus -/* When compiling with "gcc -x c++", produce a function with C linkage. */ -extern "C" const char * locale_charset (void); -#endif - /* The following static variable is declared 'volatile' to avoid a possible multithread problem in the function get_charset_aliases. If we are running in a threaded environment, and if two threads initialize diff --git a/gettext-runtime/intl/localcharset.h b/gettext-runtime/intl/localcharset.h index 2522e92ed..3b137e73c 100644 --- a/gettext-runtime/intl/localcharset.h +++ b/gettext-runtime/intl/localcharset.h @@ -1,19 +1,30 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2000-2003 Free Software Foundation, Inc. + This file is part of the GNU CHARSET Library. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + 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 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 General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _LOCALCHARSET_H +#define _LOCALCHARSET_H + + +#ifdef __cplusplus +extern "C" { +#endif - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Determine the current locale's character encoding, and canonicalize it into one of the canonical names listed in config.charset. @@ -21,3 +32,11 @@ If the canonical name cannot be determined, the result is a non-canonical name. */ extern const char * locale_charset (void); + + +#ifdef __cplusplus +} +#endif + + +#endif /* _LOCALCHARSET_H */ diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog index ba0c03d89..36d6c0097 100644 --- a/gettext-tools/lib/ChangeLog +++ b/gettext-tools/lib/ChangeLog @@ -1,3 +1,9 @@ +2003-02-28 Bruno Haible + + * localcharset.h: Change copyright to LGPL. Enclose declaration in + extern "C", for C++ compilers. + * localcharset.c: Drop C linkage declaration. + 2003-01-29 Bruno Haible * config.charset: Add an alias for CP1251 on Solaris. diff --git a/gettext-tools/lib/localcharset.c b/gettext-tools/lib/localcharset.c index dad97308c..6676e8b50 100644 --- a/gettext-tools/lib/localcharset.c +++ b/gettext-tools/lib/localcharset.c @@ -1,6 +1,6 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2002 Free Software Foundation, Inc. + Copyright (C) 2000-2003 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 @@ -85,11 +85,6 @@ # define getc getc_unlocked #endif -#ifdef __cplusplus -/* When compiling with "gcc -x c++", produce a function with C linkage. */ -extern "C" const char * locale_charset (void); -#endif - /* The following static variable is declared 'volatile' to avoid a possible multithread problem in the function get_charset_aliases. If we are running in a threaded environment, and if two threads initialize diff --git a/gettext-tools/lib/localcharset.h b/gettext-tools/lib/localcharset.h index 2522e92ed..3b137e73c 100644 --- a/gettext-tools/lib/localcharset.h +++ b/gettext-tools/lib/localcharset.h @@ -1,19 +1,30 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2000-2003 Free Software Foundation, Inc. + This file is part of the GNU CHARSET Library. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + 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 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 General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _LOCALCHARSET_H +#define _LOCALCHARSET_H + + +#ifdef __cplusplus +extern "C" { +#endif - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Determine the current locale's character encoding, and canonicalize it into one of the canonical names listed in config.charset. @@ -21,3 +32,11 @@ If the canonical name cannot be determined, the result is a non-canonical name. */ extern const char * locale_charset (void); + + +#ifdef __cplusplus +} +#endif + + +#endif /* _LOCALCHARSET_H */