projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strtoimax: Avoid link error on OSF/1 with DTK cc.
[gnulib.git]
/
lib
/
regex_internal.h
diff --git
a/lib/regex_internal.h
b/lib/regex_internal.h
index
0bd2b97
..
d7413b0
100644
(file)
--- a/
lib/regex_internal.h
+++ b/
lib/regex_internal.h
@@
-31,9
+31,7
@@
#ifndef _LIBC
# include "localcharset.h"
#endif
#ifndef _LIBC
# include "localcharset.h"
#endif
-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
+#include <locale.h>
#include <wchar.h>
#include <wctype.h>
#include <wchar.h>
#include <wctype.h>
@@
-83,7
+81,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_ISWCTYPE && HAVE_WCSCOLL) || _LIBC
+#if (defined MB_CUR_MAX && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCSCOLL) || _LIBC
# define RE_ENABLE_I18N
#endif
# define RE_ENABLE_I18N
#endif
@@
-417,11
+415,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 defined __i386__ && !defined __EMX__
-# define internal_function __attribute ((regparm (3), stdcall))
-# else
-# define internal_function
-# endif
+# define internal_function
#endif
static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr,
#endif
static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr,