*) Removed separate  definition and switched from gcc back to clang