From d5ea91965354489ef1eb271a05c4235f5b043590 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 31 Jul 2008 12:04:14 +0200 Subject: [PATCH] Make determination of BITSET_WORD_MAX work also with old HP-UX cc compilers. --- ChangeLog | 6 ++++++ lib/regex_internal.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d3942cf6f..792a1ef93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2008-07-31 Bruno Haible + * lib/regex_internal.h (BITSET_WORD_BITS): Make first conditional work + on HP-UX 10.20 with "cc -Ae". Fix second conditional. + Reported by Jonathan Patschke . + +2008-07-31 Bruno Haible + * gnulib-tool (func_import): Make change from 2008-06-23 more robust. Reported by Paolo Bonzini . diff --git a/lib/regex_internal.h b/lib/regex_internal.h index 920177a30..a95c70ac3 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -161,9 +161,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. */ -#if BITSET_WORD_MAX == 0xffffffff +#if BITSET_WORD_MAX == 0xffffffffUL # 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 -- 2.11.0