summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2006-05-16 05:34:59 +0000
committerPaolo Bonzini <bonzini@gnu.org>2008-01-09 16:12:07 +0100
commit3cfe7fdf8a2b18413bf01544d769d5ea97bdb792 (patch)
tree1fe99ce75fdf4e483a8756261ecd1660473772b2 /lib
parent6ed57b0429da7cc981b62903b4dca99232f66d6b (diff)
downloadsed-3cfe7fdf8a2b18413bf01544d769d5ea97bdb792.tar.gz
Fix compilation on non-GCC compilers, update po files
2006-05-15 Hans-Bernhard Bröker <broeker@physik.rwth-aachen.de> * sed/basicdefs.h (OB_MALLOC): Turn VCAST into void * cast. git-archimport-id: bonzini@gnu.org--2004b/sed--stable--4.1--patch-66
Diffstat (limited to 'lib')
-rw-r--r--lib/regcomp.c9
-rw-r--r--lib/regex.c4
2 files changed, 11 insertions, 2 deletions
diff --git a/lib/regcomp.c b/lib/regcomp.c
index d35ae5f..9f10de7 100644
--- a/lib/regcomp.c
+++ b/lib/regcomp.c
@@ -557,8 +557,13 @@ weak_alias (__regerror, regerror)
a worthwhile optimization. */
static const bitset_t utf8_sb_map =
{
- /* Set the first 128 bits. */
- [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX
+#if BITSET_WORD_MAX == 0xFFFFFFFFL
+ BITSET_WORD_MAX, BITSET_WORD_MAX, BITSET_WORD_MAX, BITSET_WORD_MAX
+#elif BITSET_WORD_MAX == 0xFFFFFFFFFFFFFFFFL
+ BITSET_WORD_MAX, BITSET_WORD_MAX
+#else
+#error invalid BITSET_WORD_BITS setting
+#endif
};
#endif
diff --git a/lib/regex.c b/lib/regex.c
index d2d4f28..48ca593 100644
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -57,6 +57,10 @@
#undefs RE_DUP_MAX and sets it to the right value. */
#include <limits.h>
+#ifndef HAVE__BOOL
+#include "stdbool.h"
+#endif /* not defined HAVE__BOOL */
+
#include <regex.h>
#include "regex_internal.h"