projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maint: make Include sections of modules consistent
[gnulib.git]
/
lib
/
regex_internal.h
diff --git
a/lib/regex_internal.h
b/lib/regex_internal.h
index
9a978b2
..
859832f
100644
(file)
--- a/
lib/regex_internal.h
+++ b/
lib/regex_internal.h
@@
-1,5
+1,6
@@
/* Extended regular expression matching and search library.
/* 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, 2008, 2009
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
@@
-27,22
+28,17
@@
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#ifndef _LIBC
-# include "strcase.h"
-#endif
-
-#if defined HAVE_LANGINFO_H || defined HAVE_LANGINFO_CODESET || defined _LIBC
+#ifdef _LIBC
# include <langinfo.h>
# include <langinfo.h>
+#else
+# include "localcharset.h"
#endif
#if defined HAVE_LOCALE_H || defined _LIBC
# include <locale.h>
#endif
#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 */
+
+#include <wchar.h>
+#include <wctype.h>
#include <stdint.h>
#if defined _LIBC
# include <bits/libc-lock.h>
#include <stdint.h>
#if defined _LIBC
# include <bits/libc-lock.h>
@@
-53,7
+49,7
@@
#endif
/* In case that the system doesn't have isblank(). */
#endif
/* In case that the system doesn't have isblank(). */
-#if !defined _LIBC && !
HAVE_DECL_ISBLANK && !defined isblank
+#if !defined _LIBC && !
(defined isblank || (HAVE_ISBLANK && HAVE_DECL_ISBLANK))
# define isblank(ch) ((ch) == ' ' || (ch) == '\t')
#endif
# define isblank(ch) ((ch) == ' ' || (ch) == '\t')
#endif
@@
-89,7
+85,7
@@
# define SIZE_MAX ((size_t) -1)
#endif
# 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_WCSCOLL) || _LIBC
# define RE_ENABLE_I18N
#endif
# define RE_ENABLE_I18N
#endif
@@
-119,10
+115,8
@@
# define __wctype wctype
# define __iswctype iswctype
# define __btowc btowc
# define __wctype wctype
# define __iswctype iswctype
# define __btowc btowc
-# ifndef __mempcpy
-# define __mempcpy mempcpy
-# endif
# define __wcrtomb wcrtomb
# define __wcrtomb wcrtomb
+# define __mbrtowc mbrtowc
# define __regfree regfree
# define attribute_hidden
#endif /* not _LIBC */
# define __regfree regfree
# define attribute_hidden
#endif /* not _LIBC */
@@
-169,9
+163,9
@@
typedef unsigned long int bitset_word_t;
instead, deduce it directly from BITSET_WORD_MAX. Avoid
greater-than-32-bit integers and unconditional shifts by more than
31 bits, as they're not portable. */
instead, deduce it directly from BITSET_WORD_MAX. Avoid
greater-than-32-bit integers and unconditional shifts by more than
31 bits, as they're not portable. */
-#if BITSET_WORD_MAX == 0xffffffff
+#if BITSET_WORD_MAX == 0xffffffff
UL
# define BITSET_WORD_BITS 32
# define BITSET_WORD_BITS 32
-#elif BITSET_WORD_MAX >> 31 >>
5
== 1
+#elif BITSET_WORD_MAX >> 31 >>
4
== 1
# define BITSET_WORD_BITS 36
#elif BITSET_WORD_MAX >> 31 >> 16 == 1
# define BITSET_WORD_BITS 48
# define BITSET_WORD_BITS 36
#elif BITSET_WORD_MAX >> 31 >> 16 == 1
# define BITSET_WORD_BITS 48
@@
-190,10
+184,6
@@
typedef unsigned long int bitset_word_t;
# if BITSET_WORD_BITS <= SBC_MAX
# error "Invalid SBC_MAX"
# endif
# if BITSET_WORD_BITS <= SBC_MAX
# error "Invalid SBC_MAX"
# endif
-#elif BITSET_WORD_MAX == (0xffffffff + 2) * 0xffffffff
-/* Work around a bug in 64-bit PGC (before version 6.1-2), where the
- preprocessor mishandles large unsigned values as if they were signed. */
-# define BITSET_WORD_BITS 64
#else
# error "Add case for new bitset_word_t size"
#endif
#else
# error "Add case for new bitset_word_t size"
#endif
@@
-429,7
+419,7
@@
struct re_dfa_t;
typedef struct re_dfa_t re_dfa_t;
#ifndef _LIBC
typedef struct re_dfa_t re_dfa_t;
#ifndef _LIBC
-# if
def __i386
__
+# if
defined __i386__ && !defined __EMX
__
# define internal_function __attribute ((regparm (3), stdcall))
# else
# define internal_function
# define internal_function __attribute ((regparm (3), stdcall))
# else
# define internal_function