diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-08-26 01:35:19 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-08-26 01:35:19 +0000 |
| commit | 3fa1046805695f2baca120331f9a2b7bc736db20 (patch) | |
| tree | 96f4b8fb7e5619d716b912f37a51b07110b58bb1 | |
| parent | ec1e04dedb30596bb5bccad675feb0608f92cea9 (diff) | |
| download | glibc-3fa1046805695f2baca120331f9a2b7bc736db20.tar glibc-3fa1046805695f2baca120331f9a2b7bc736db20.tar.gz glibc-3fa1046805695f2baca120331f9a2b7bc736db20.tar.bz2 glibc-3fa1046805695f2baca120331f9a2b7bc736db20.zip | |
* posix/regex_internal.h: Prevent some declarations and definitions
to be seen when used in tests.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | posix/regex_internal.h | 16 |
2 files changed, 13 insertions, 6 deletions
@@ -1,5 +1,8 @@ 2007-08-25 Ulrich Drepper <drepper@redhat.com> + * posix/regex_internal.h: Prevent some declarations and definitions + to be seen when used in tests. + * posix/tst-rfc3484.c (__idna_to_unicode_lzlz): Initialize *OUTPUT. * posix/tst-rfc3484-2.c (__idna_to_unicode_lzlz): Likewise. diff --git a/posix/regex_internal.h b/posix/regex_internal.h index 3b575c3c48..24d0fbba7d 100644 --- a/posix/regex_internal.h +++ b/posix/regex_internal.h @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -385,18 +385,20 @@ typedef struct re_dfa_t re_dfa_t; # endif #endif +#ifndef NOT_IN_libc static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr, int new_buf_len) internal_function; -#ifdef RE_ENABLE_I18N +# ifdef RE_ENABLE_I18N static void build_wcs_buffer (re_string_t *pstr) internal_function; static int build_wcs_upper_buffer (re_string_t *pstr) internal_function; -#endif /* RE_ENABLE_I18N */ +# endif /* RE_ENABLE_I18N */ static void build_upper_buffer (re_string_t *pstr) internal_function; static void re_string_translate_buffer (re_string_t *pstr) internal_function; static unsigned int re_string_context_at (const re_string_t *input, int idx, int eflags) internal_function __attribute ((pure)); +#endif #define re_string_peek_byte(pstr, offset) \ ((pstr)->mbs[(pstr)->cur_idx + offset]) #define re_string_fetch_byte(pstr) \ @@ -732,15 +734,16 @@ re_string_wchar_at (const re_string_t *pstr, int idx) return (wint_t) pstr->wcs[idx]; } +# ifndef NOT_IN_libc static int internal_function __attribute ((pure)) re_string_elem_size_at (const re_string_t *pstr, int idx) { -# ifdef _LIBC +# ifdef _LIBC const unsigned char *p, *extra; const int32_t *table, *indirect; int32_t tmp; -# include <locale/weight.h> +# include <locale/weight.h> uint_fast32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); if (nrules != 0) @@ -755,9 +758,10 @@ re_string_elem_size_at (const re_string_t *pstr, int idx) return p - pstr->mbs - idx; } else -# endif /* _LIBC */ +# endif /* _LIBC */ return 1; } +# endif #endif /* RE_ENABLE_I18N */ #endif /* _REGEX_INTERNAL_H */ |