use only one set of logging macros instead of two and don't use free() as a function name
Merge pull request #372 from Bigpet/logsimpler

Don't use two sets of logging functions