correct initialization code (#3376)

Explicitly initialize struct members rather than relying on compiler extensions.
2 files changed