Somehow, several defines were deleted whilst working on
LFS for Windows.  This restores those definitions.
Merge branch 'master' of http://github.com/Unidata/netcdf-c