diff options
| author | Pedro J. Ruiz Lopez <holzplatten@es.gnu.org> | 2007-02-12 23:24:21 +0000 |
|---|---|---|
| committer | Pedro J. Ruiz Lopez <holzplatten@es.gnu.org> | 2007-02-12 23:24:21 +0000 |
| commit | 80f3bd30c7521091c1dea118603b20a76c2a180c (patch) | |
| tree | 359d11fb051a720d6958341ab5ac1fbff2fe5fd2 /lib/regex_internal.h | |
| parent | 56a64cd30f232800884506d88acd780c431be1a5 (diff) | |
| download | idutils-80f3bd30c7521091c1dea118603b20a76c2a180c.tar.gz idutils-80f3bd30c7521091c1dea118603b20a76c2a180c.tar.bz2 idutils-80f3bd30c7521091c1dea118603b20a76c2a180c.zip | |
* upgraded gnulib
Diffstat (limited to 'lib/regex_internal.h')
| -rw-r--r-- | lib/regex_internal.h | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/lib/regex_internal.h b/lib/regex_internal.h index 993c992..a19c9a7 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -27,29 +27,19 @@ #include <stdlib.h> #include <string.h> -#ifndef _LIBC -# include "strcase.h" -#endif - #if defined HAVE_LANGINFO_H || defined HAVE_LANGINFO_CODESET || defined _LIBC # include <langinfo.h> #endif #if defined HAVE_LOCALE_H || defined _LIBC # include <locale.h> #endif -#if defined HAVE_WCHAR_H || defined _LIBC -# include <wchar.h> -#endif /* HAVE_WCHAR_H || _LIBC */ -#if defined HAVE_WCTYPE_H || defined _LIBC -# include <wctype.h> -#endif /* HAVE_WCTYPE_H || _LIBC */ -#if defined HAVE_STDINT_H || defined _LIBC -# include <stdint.h> -#endif /* HAVE_STDINT_H || _LIBC */ + +#include <wchar.h> +#include <wctype.h> +#include <stdint.h> #if defined _LIBC # include <bits/libc-lock.h> #else -# define __libc_lock_define(CLASS,NAME) # define __libc_lock_init(NAME) do { } while (0) # define __libc_lock_lock(NAME) do { } while (0) # define __libc_lock_unlock(NAME) do { } while (0) @@ -92,7 +82,7 @@ # define SIZE_MAX ((size_t) -1) #endif -#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_WCRTOMB && HAVE_MBRTOWC && HAVE_WCSCOLL) || _LIBC +#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCRTOMB && HAVE_MBRTOWC && HAVE_WCSCOLL) || _LIBC # define RE_ENABLE_I18N #endif @@ -122,9 +112,6 @@ # define __wctype wctype # define __iswctype iswctype # define __btowc btowc -# ifndef __mempcpy -# define __mempcpy mempcpy -# endif # define __wcrtomb wcrtomb # define __regfree regfree # define attribute_hidden @@ -351,7 +338,7 @@ typedef struct Idx idx; /* for BACK_REF */ re_context_type ctx_type; /* for ANCHOR */ } opr; -#if __GNUC__ >= 2 +#if __GNUC__ >= 2 && !__STRICT_ANSI__ re_token_type_t type : 8; #else re_token_type_t type; @@ -711,7 +698,9 @@ struct re_dfa_t #ifdef DEBUG char* re_str; #endif +#ifdef _LIBC __libc_lock_define (, lock) +#endif }; #define re_node_set_init_empty(set) memset (set, '\0', sizeof (re_node_set)) |