Re: regex: 7 patches syncing from glibc to gnulib

[Eric Blake]

According to Jim Meyering on 1/28/2010 3:42 AM:
> Today, I've just pushed a few fixes from glibc into gnulib,
> as well as a few white-space-only changes that will make my
> subsequent merges a little easier.

Commit 54b5ce0e breaks on non-glibc platforms:

> index f5c3125..704d1cc 100644
> --- a/lib/regex_internal.h
> +++ b/lib/regex_internal.h
> @@ -851,4 +851,12 @@ re_string_elem_size_at (const re_string_t *pstr, Idx idx)
>  }
>  #endif /* RE_ENABLE_I18N */
> 
> +#if __GNUC_PREREQ (3,4)
> +# undef __attribute_warn_unused_result__
> +# define __attribute_warn_unused_result__ \
> +   __attribute__ ((__warn_unused_result__))
> +#else
> +# define __attribute_warn_unused_result__ /* empty */
> +#endif
> +
>  #endif /*  _REGEX_INTERNAL_H */
> 

because there is no other definition of __GNUC_PREREQ():

In file included from ../../lib/regex.c:59:
../../lib/regex_internal.h:854:19: error: missing binary operator before
token "("

It looks like several other files have a sane definition, such as fts_.h.
 Any preferences on which version to use?

-- 
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden

signature.asc
Description: OpenPGP digital signature