From 57d231ae1aca949b069c4e5e9ba67ed4445f33f2 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 3 Apr 2010 10:46:26 +0200 Subject: [PATCH] localename: Port to MacOS X 10.6. --- ChangeLog | 7 +++++++ lib/localename.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b26f2161b..141fb15f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-04-03 Bruno Haible + + localename: Port to MacOS X 10.6. + * lib/localename.c (gl_locale_name_thread_unsafe): On MacOS X, try the + memory layout of the locales in MacOS X 10.6 as well. + Reported by Panu Kekäläinen . + 2010-04-02 Bruno Haible gnulib-tool: Ensure that long-running tests are executed last. diff --git a/lib/localename.c b/lib/localename.c index d62ae6682..ea646c508 100644 --- a/lib/localename.c +++ b/lib/localename.c @@ -2625,12 +2625,24 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname) locale names of length > 31, we can assume that it is NUL terminated in this buffer. But we need to make a copy of the locale name, of indefinite extent. */ - struct _xlocale + struct _xlocale_part1_v0 /* used in MacOS X 10.5 */ { int32_t __refcount; void (*__free_extra)(void *); __darwin_mbstate_t __mbs[10]; int64_t __magic; + }; + struct _xlocale_part1_v1 /* used in MacOS X >= 10.6.0 */ + { + int32_t __refcount; + void (*__free_extra)(void *); + __darwin_mbstate_t __mbs[10]; + /*pthread_lock_t*/ int __lock; + int64_t __magic; + }; + struct _xlocale_part2 + { + int64_t __magic; unsigned char __collate_load_error; unsigned char __collate_substitute_nontrivial; unsigned char _messages_using_locale; @@ -2689,7 +2701,23 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname) char *_time_locale_buf; /* more */ }; - struct _xlocale *tlp = (struct _xlocale *) thread_locale; + struct _xlocale_part2 *tlp; + if (((struct _xlocale_part1_v0 *) thread_locale)->__magic + == 0x786C6F63616C6530LL) + /* MacOS X 10.5 */ + tlp = + (struct _xlocale_part2 *) + &((struct _xlocale_part1_v0 *) thread_locale)->__magic; + else if (((struct _xlocale_part1_v1 *) thread_locale)->__magic + == 0x786C6F63616C6530LL) + /* MacOS X >= 10.6.0 */ + tlp = + (struct _xlocale_part2 *) + &((struct _xlocale_part1_v1 *) thread_locale)->__magic; + else + /* Unsupported version of MacOS X: The internals of 'struct _xlocale' + have changed again. */ + return ""; switch (category) { case LC_CTYPE: -- 2.11.0