Merge pull request #4 from apache/has_have_confusion

Fix compilation errors and use of macro