Changed a #define cast to struct to be a properly declared struct