Added missing macro definitions to utils_general.c
Merge branch 'master' into coverity_scan