updated defines and related warnings