Commit 1a45ff10 authored by Eli Zaretskii's avatar Eli Zaretskii

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

parent a09f1eb7
......@@ -597,11 +597,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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment