fixed g++ compile errors introduced in 79161a using macro approach