preprocessor fixes for hpux

some missing underscore from definition, and additions where
only HPUX (and not __hpux) macro was checked.