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

Needed to finally fix #3472