Commit 8bc6c878e9e3cc2941eb1264693841ece84ceaaa

J. Peter Mugaas 2017-10-21T13:57:44

Fix macro redefinition warning