build fix and use c++ style initialization not a macro