projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
getloadavg: use libperfstat on AIX5
[gnulib.git]
/
lib
/
regex_internal.h
diff --git
a/lib/regex_internal.h
b/lib/regex_internal.h
index
cc9b5b7
..
5c07f93
100644
(file)
--- a/
lib/regex_internal.h
+++ b/
lib/regex_internal.h
@@
-1,5
+1,5
@@
/* 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
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
+27,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
+48,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
+84,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_WCRTOMB && HAVE_MBRTOWC && HAVE_WCSCOLL) || _LIBC
# define RE_ENABLE_I18N
#endif
# define RE_ENABLE_I18N
#endif
@@
-119,9
+114,6
@@
# 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 __regfree regfree
# define attribute_hidden
# define __wcrtomb wcrtomb
# define __regfree regfree
# define attribute_hidden
@@
-348,7
+340,7
@@
typedef struct
Idx idx; /* for BACK_REF */
re_context_type ctx_type; /* for ANCHOR */
} opr;
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;
re_token_type_t type : 8;
#else
re_token_type_t type;