replaced DATA_TYPE_* with CF_DATA_TYPE_* to fix trouble on solaris 11.1 (
#3472)
Merge pull request #1259 from mmuensch/3.5.x

[3.5.x] (#3472) replaced DATA_TYPE_* with CF_DATA_TYPE_* to fix trouble on solaris 11.1