From f45706ca6ade259d2cf9397c35b0135991470197 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Wed, 1 Feb 2006 09:22:45 +0000 Subject: global data uses libc_hidden_data_def, convert all -I hope- and add some new --- libc/misc/ctype/ctype.c | 18 +++++++++--------- libc/misc/error/error.c | 2 ++ libc/misc/gnu/obstack.c | 4 ++-- libc/misc/internals/__uClibc_main.c | 4 ++-- libc/misc/locale/locale.c | 4 ++-- libc/misc/time/time.c | 6 +++--- libc/misc/wchar/wchar.c | 2 +- 7 files changed, 21 insertions(+), 19 deletions(-) (limited to 'libc/misc') diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c index d470a2e32..6f71b1421 100644 --- a/libc/misc/ctype/ctype.c +++ b/libc/misc/ctype/ctype.c @@ -856,16 +856,16 @@ const __ctype_mask_t __C_ctype_b_data[] = { /* 254 M-~ */ 0, /* 255 M-^? */ 0 }; -libc_hidden_def(__C_ctype_b_data) +libc_hidden_data_def(__C_ctype_b_data) libc_hidden_proto(__C_ctype_b) const __ctype_mask_t *__C_ctype_b = __C_ctype_b_data + __UCLIBC_CTYPE_B_TBL_OFFSET; -libc_hidden_def(__C_ctype_b) +libc_hidden_data_def(__C_ctype_b) #ifndef __UCLIBC_HAS_XLOCALE__ const __ctype_mask_t *__ctype_b = __C_ctype_b_data + __UCLIBC_CTYPE_B_TBL_OFFSET; -libc_hidden_def(__ctype_b) +libc_hidden_data_def(__ctype_b) #endif @@ -975,19 +975,19 @@ const __ctype_touplow_t __C_ctype_tolower_data[] = { 248, 249, 250, 251, 252, 253, 254, 255 }; -libc_hidden_def(__C_ctype_tolower_data) +libc_hidden_data_def(__C_ctype_tolower_data) libc_hidden_proto(__C_ctype_tolower) const __ctype_touplow_t *__C_ctype_tolower = __C_ctype_tolower_data + __UCLIBC_CTYPE_TO_TBL_OFFSET; -libc_hidden_def(__C_ctype_tolower) +libc_hidden_data_def(__C_ctype_tolower) #ifndef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_tolower) const __ctype_touplow_t *__ctype_tolower = __C_ctype_tolower_data + __UCLIBC_CTYPE_TO_TBL_OFFSET; -libc_hidden_def(__ctype_tolower) +libc_hidden_data_def(__ctype_tolower) #endif @@ -1097,19 +1097,19 @@ const __ctype_touplow_t __C_ctype_toupper_data[] = { 248, 249, 250, 251, 252, 253, 254, 255 }; -libc_hidden_def(__C_ctype_toupper_data) +libc_hidden_data_def(__C_ctype_toupper_data) libc_hidden_proto(__C_ctype_toupper) const __ctype_touplow_t *__C_ctype_toupper = __C_ctype_toupper_data + __UCLIBC_CTYPE_TO_TBL_OFFSET; -libc_hidden_def(__C_ctype_toupper) +libc_hidden_data_def(__C_ctype_toupper) #ifndef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_toupper) const __ctype_touplow_t *__ctype_toupper = __C_ctype_toupper_data + __UCLIBC_CTYPE_TO_TBL_OFFSET; -libc_hidden_def(__ctype_toupper) +libc_hidden_data_def(__ctype_toupper) #endif diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c index 3e44a01ee..bc6117d8f 100644 --- a/libc/misc/error/error.c +++ b/libc/misc/error/error.c @@ -39,7 +39,9 @@ libc_hidden_proto(stdout) libc_hidden_proto(stderr) /* This variable is incremented each time `error' is called. */ +libc_hidden_proto(error_message_count) unsigned int error_message_count = 0; +libc_hidden_data_def(error_message_count) /* Sometimes we want to have at most one error per line. This variable controls whether this mode is selected or not. */ int error_one_per_line; diff --git a/libc/misc/gnu/obstack.c b/libc/misc/gnu/obstack.c index c1ae75869..99311183f 100644 --- a/libc/misc/gnu/obstack.c +++ b/libc/misc/gnu/obstack.c @@ -97,7 +97,7 @@ void (*obstack_alloc_failed_handler) (void) = print_and_abort; static void print_and_abort (); void (*obstack_alloc_failed_handler) () = print_and_abort; # endif -libc_hidden_def(obstack_alloc_failed_handler) +libc_hidden_data_def(obstack_alloc_failed_handler) /* Exit value used when `print_and_abort' is used. */ @@ -118,7 +118,7 @@ libc_hidden_proto(fwprintf) libc_hidden_proto(obstack_exit_failure) int obstack_exit_failure = EXIT_FAILURE; -libc_hidden_def(obstack_exit_failure) +libc_hidden_data_def(obstack_exit_failure) /* The non-GNU-C macros copy the obstack into this global variable to avoid multiple evaluation. */ diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index 39dceac89..1318fc99e 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -97,7 +97,7 @@ strong_alias (__progname_full, program_invocation_name) */ libc_hidden_proto(__environ) char **__environ = 0; -libc_hidden_def(__environ) +libc_hidden_data_def(__environ) /* psm: arm segfaults with strong_alias, although defined */ weak_alias(__environ,environ) @@ -105,7 +105,7 @@ weak_alias(__environ,environ) extern size_t __pagesize; libc_hidden_proto(__pagesize) size_t __pagesize = 0; -libc_hidden_def(__pagesize) +libc_hidden_data_def(__pagesize) #ifndef O_NOFOLLOW # define O_NOFOLLOW 0 diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c index 5ad829d2c..e53731e94 100644 --- a/libc/misc/locale/locale.c +++ b/libc/misc/locale/locale.c @@ -377,12 +377,12 @@ libc_hidden_proto(__ctype_toupper) __uclibc_locale_t __global_locale_data; __locale_t __global_locale = &__global_locale_data; -libc_hidden_def(__global_locale) +libc_hidden_data_def(__global_locale) #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__curlocale_var) __locale_t __curlocale_var = &__global_locale_data; -libc_hidden_def(__curlocale_var) +libc_hidden_data_def(__curlocale_var) #endif /*----------------------------------------------------------------------*/ diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c index 84f201d44..fb79883c9 100644 --- a/libc/misc/time/time.c +++ b/libc/misc/time/time.c @@ -1705,13 +1705,13 @@ static const char vals[] = { /* Initialize to UTC. */ libc_hidden_proto(daylight) int daylight = 0; -libc_hidden_def(daylight) +libc_hidden_data_def(daylight) libc_hidden_proto(timezone) long timezone = 0; -libc_hidden_def(timezone) +libc_hidden_data_def(timezone) libc_hidden_proto(tzname) char *tzname[2] = { (char *) UTC, (char *) (UTC-1) }; -libc_hidden_def(tzname) +libc_hidden_data_def(tzname) #ifdef __UCLIBC_HAS_THREADS__ attribute_hidden pthread_mutex_t _time_tzlock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c index 099769c2f..a795986e8 100644 --- a/libc/misc/wchar/wchar.c +++ b/libc/misc/wchar/wchar.c @@ -1269,7 +1269,7 @@ const unsigned char __iconv_codesets[] = "\x08\x02""UTF-8\x00" "\x0b\x01""US-ASCII\x00" "\x07\x01""ASCII"; /* Must be last! (special case to save a nul) */ -libc_hidden_def(__iconv_codesets) +libc_hidden_data_def(__iconv_codesets) libc_hidden_proto(strcasecmp) -- cgit v1.2.3