aboutsummaryrefslogtreecommitdiff
path: root/iconv/gconv_int.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
committerUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
commita334319f6530564d22e775935d9c91663623a1b4 (patch)
treeb5877475619e4c938e98757d518bb1e9cbead751 /iconv/gconv_int.h
parent0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (diff)
downloadglibc-a334319f6530564d22e775935d9c91663623a1b4.zip
glibc-a334319f6530564d22e775935d9c91663623a1b4.tar.gz
glibc-a334319f6530564d22e775935d9c91663623a1b4.tar.bz2
(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.
Diffstat (limited to 'iconv/gconv_int.h')
-rw-r--r--iconv/gconv_int.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h
index 8d9cdae..36d4ae2 100644
--- a/iconv/gconv_int.h
+++ b/iconv/gconv_int.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -22,8 +22,6 @@
#include "gconv.h"
#include <stdlib.h> /* For alloca used in macro below. */
-#include <ctype.h> /* For __toupper_l used in macro below. */
-#include <string.h> /* For strlen et al used in macro below. */
#include <bits/libc-lock.h>
__BEGIN_DECLS
@@ -128,7 +126,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 attribute_hidden)
+__libc_lock_define (extern, __gconv_lock);
/* The gconv functions expects the name to be in upper case and complete,
@@ -148,7 +146,7 @@ __libc_lock_define (extern, __gconv_lock attribute_hidden)
tmp = result = __alloca (cp - (str) + 3 + suffix_len); \
cp = (str); \
while (*cp != '\0') \
- *tmp++ = __toupper_l (*cp++, _nl_C_locobj_ptr); \
+ *tmp++ = __toupper_l (*cp++, &_nl_C_locobj); \
if (cnt < 2) \
{ \
*tmp++ = '/'; \