diff options
| author | Werner Koch <wk@gnupg.org> | 2007-07-04 21:49:40 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2007-07-04 21:49:40 +0200 |
| commit | 93d3811abc9e1a1199c0c2594d6b2163d2ce5324 (patch) | |
| tree | 7c374293c539db3cf2057c830ef2da2ece2bb10c /jnlib/utf8conv.c | |
| parent | A bunch of minor changes for Windows. (diff) | |
| download | gnupg2-93d3811abc9e1a1199c0c2594d6b2163d2ce5324.tar.xz gnupg2-93d3811abc9e1a1199c0c2594d6b2163d2ce5324.zip | |
Changed to GPLv3.
Removed intl/.
Diffstat (limited to 'jnlib/utf8conv.c')
| -rw-r--r-- | jnlib/utf8conv.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/jnlib/utf8conv.c b/jnlib/utf8conv.c index ac0f2e2e1..1b9c93dff 100644 --- a/jnlib/utf8conv.c +++ b/jnlib/utf8conv.c @@ -6,7 +6,7 @@ * * JNLIB 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 + * published by the Free Software Foundation; either version 3 of * the License, or (at your option) any later version. * * JNLIB is distributed in the hope that it will be useful, but @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser 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. + * License along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> @@ -87,8 +85,8 @@ load_libiconv (void) { log_info (_("error loading `%s': %s\n"), "iconv.dll", dlerror ()); - log_info (_("please see http://www.gnupg.org/download/iconv.html " - "for more information\n")); + log_info (_("please see %s for more information\n"), + "http://www.gnupg.org/download/iconv.html"); iconv_open = NULL; iconv = NULL; iconv_close = NULL; @@ -726,7 +724,7 @@ jnlib_iconv (jnlib_iconv_t cd, return 0; #endif /*HAVE_W32_SYSTEM*/ - return iconv ((iconv_t)cd, inbuf, inbytesleft, outbuf, outbytesleft); + return iconv ((iconv_t)cd, (char**)inbuf, inbytesleft, outbuf, outbytesleft); } /* Wrapper function for iconv_close, required for W32 as we dlopen that |