about summary refs log tree commit diff
path: root/locale/newlocale.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/newlocale.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/newlocale.c')
-rw-r--r--locale/newlocale.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/locale/newlocale.c b/locale/newlocale.c
index b646ffeacd..b3d4b464b1 100644
--- a/locale/newlocale.c
+++ b/locale/newlocale.c
@@ -1,5 +1,5 @@
 /* Return a reference to locale information record.
-   Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2004
+   Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2004, 2005
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -66,7 +66,7 @@ __newlocale (int category_mask, const char *locale, __locale_t base)
   if (locale == NULL)
     ERROR_RETURN;
 
-  if (base == &_nl_C_locobj)
+  if (base == _nl_C_locobj_ptr)
     /* We're to modify BASE, returned for a previous call with "C".
        We can't really modify the read-only structure, so instead
        start over by copying it.  */
@@ -75,7 +75,7 @@ __newlocale (int category_mask, const char *locale, __locale_t base)
   if ((base == NULL || category_mask == (1 << __LC_LAST) - 1 - (1 << LC_ALL))
       && (category_mask == 0 || !strcmp (locale, "C")))
     /* Asking for the "C" locale needn't allocate a new object.  */
-    return &_nl_C_locobj;
+    return _nl_C_locobj_ptr;
 
   /* Allocate memory for the result.  */
   if (base != NULL)