Can't use formal parameter name 'template' in stdlib.h.  Causes C++ compilation errors.  Noted by Lorenz Meier
Update csdtio too
Merge branch 'master' of git://git.code.sf.net/p/nuttx/git