about summary refs log tree commit diff
path: root/locale/duplocale.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-12-21 07:28:33 +0000
committerUlrich Drepper <drepper@redhat.com>2005-12-21 07:28:33 +0000
commit4b5b009cc3045ca026b061ce55160bd1eeb0888c (patch)
tree2d96c43bf7b80ff910b72f68995aee66bde5d59b /locale/duplocale.c
parent808e0190f752df65c715ad389a34f27f836534ef (diff)
downloadglibc-4b5b009cc3045ca026b061ce55160bd1eeb0888c.tar.gz
glibc-4b5b009cc3045ca026b061ce55160bd1eeb0888c.tar.xz
glibc-4b5b009cc3045ca026b061ce55160bd1eeb0888c.zip
* locale/xlocale.c (_nl_C_locobj): Mark as const.
	* include/locale.h: Define _nl_C_locobj_ptr.
	* iconv/gconv_charset.h: Use _nl_C_locobj_ptr instead of using pointer
	to _nl_C_locobj because we also need a cast.
	* iconv/gconv_conf.c: Likewise.
	* iconv/gconv_int.h: Likewise.
	* iconv/gconv_open.c: Likewise.
	* locale/duplocale.c: Likewise.
	* locale/freelocale.c: Likewise.
	* locale/newlocale.c: Likewise.
	* misc/syslog.c: Likewise.
	* stdlib/strtod_l.c: Likewise.
	* sysdeps/unix/sysv/linux/getloadavg.c: Likewise.
Diffstat (limited to 'locale/duplocale.c')
-rw-r--r--locale/duplocale.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/locale/duplocale.c b/locale/duplocale.c
index 77dfc01046..0cec09f63a 100644
--- a/locale/duplocale.c
+++ b/locale/duplocale.c
@@ -1,5 +1,5 @@
 /* Duplicate handle for selection of locales.
-   Copyright (C) 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -34,7 +34,7 @@ __locale_t
 __duplocale (__locale_t dataset)
 {
   /* This static object is returned for newlocale (LC_ALL_MASK, "C").  */
-  if (dataset == &_nl_C_locobj)
+  if (dataset == _nl_C_locobj_ptr)
     return dataset;
 
   __locale_t result;