replaced DATA_TYPE_* with CF_DATA_TYPE_* to fix trouble on solaris 11.1

as requested from 3.5.x to master.