fix build error when ENABLE_DEBUG is defined
Merge pull request #1515 from mynz/master

fix build error when ENABLE_DEBUG is defined
Remove function delaration not implemented in code
Merge pull request #1518 from dmajkic/master

Remove function delaration not implemented in code
Merge branch 'master' into iij