changeset 29985:56798a7611c0

Make determination of BITSET_WORD_MAX work also with old HP-UX cc compilers.
author Bruno Haible <bruno@clisp.org>
date Thu, 31 Jul 2008 12:04:14 +0200
parents a15adfcdef07
children ff6a63286245
files ChangeLog lib/regex_internal.h
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jul 31 11:34:41 2008 +0200
+++ b/ChangeLog	Thu Jul 31 12:04:14 2008 +0200
@@ -1,3 +1,9 @@
+2008-07-31  Bruno Haible  <bruno@clisp.org>
+
+	* 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 <jp@centtech.com>.
+
 2008-07-31  Bruno Haible  <bruno@clisp.org>
 
 	* gnulib-tool (func_import): Make change from 2008-06-23 more robust.
--- a/lib/regex_internal.h	Thu Jul 31 11:34:41 2008 +0200
+++ b/lib/regex_internal.h	Thu Jul 31 12:04:14 2008 +0200
@@ -161,9 +161,9 @@
    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