Clean up Solaris 11 fixes, use GNU preprocessor definitions when
available.