Make code C99/C++03 compliant