Updated to build with clang

See http://clang.llvm.org/compatibility.html#vla