From 0ecb606cb6cf65de1d9fc8a919bceb4be476c602 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 12 Jul 2007 18:26:36 +0000 Subject: 2.5-18.1 --- iconv/gconv_int.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'iconv/gconv_int.h') diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h index 36d4ae2d44..8d9cdaefc2 100644 --- a/iconv/gconv_int.h +++ b/iconv/gconv_int.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997-2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1997-2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -22,6 +22,8 @@ #include "gconv.h" #include /* For alloca used in macro below. */ +#include /* For __toupper_l used in macro below. */ +#include /* For strlen et al used in macro below. */ #include __BEGIN_DECLS @@ -126,7 +128,7 @@ extern struct gconv_module *__gconv_modules_db attribute_hidden; extern const char *__gconv_path_envvar attribute_hidden; /* Lock for the conversion database content. */ -__libc_lock_define (extern, __gconv_lock); +__libc_lock_define (extern, __gconv_lock attribute_hidden) /* The gconv functions expects the name to be in upper case and complete, @@ -146,7 +148,7 @@ __libc_lock_define (extern, __gconv_lock); tmp = result = __alloca (cp - (str) + 3 + suffix_len); \ cp = (str); \ while (*cp != '\0') \ - *tmp++ = __toupper_l (*cp++, &_nl_C_locobj); \ + *tmp++ = __toupper_l (*cp++, _nl_C_locobj_ptr); \ if (cnt < 2) \ { \ *tmp++ = '/'; \ -- cgit 1.4.1