Descriptor field changes. Get linux compile to work. Rerun astyle.
fix linux warnings (32-bit at ones at least)