(get_charset_id): Use if-else instead of ?:.

diff --git a/src/ChangeLog b/src/ChangeLog
index 942d702748a4d9ad4cc53506c074172685366d9d..241bedb967c985234c100e11bff9e36b4c2df14f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-06  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * charset.c (get_charset_id): Use if-else instead of ?:.
+
 2001-02-06  Richard M. Stallman  <rms@gnu.org>
 
        * coding.c (code_convert_region): Update coding->cmp_data->char_offset

diff --git a/src/charset.c b/src/charset.c
index d1c86342f9516d3185fe2993517fc8aa6b7fbcf4..d630ec995d66760ad5308d4610d9fa8c86285605 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -599,11 +599,15 @@ get_charset_id (charset_symbol)
   Lisp_Object val;
   int charset;
 
-  return ((SYMBOLP (charset_symbol)
-          && (val = Fget (charset_symbol, Qcharset), VECTORP (val))
-          && (charset = XINT (XVECTOR (val)->contents[CHARSET_ID_IDX]),
-              CHARSET_VALID_P (charset)))
-         ? charset : -1);
+  /* This originally used a ?: operator, but reportedly the HP-UX
+     compiler version HP92453-01 A.10.32.22 miscompiles that.  */
+  if (SYMBOLP (charset_symbol)
+      && VECTORP (val = Fget (charset_symbol, Qcharset))
+      && CHARSET_VALID_P (charset =
+                         XINT (XVECTOR (val)->contents[CHARSET_ID_IDX])))
+    return charset;
+  else
+    return -1;
 }
 
 /* Return an identification number for a new private charset of