Merge pull request #8001 from alalek:c_defines
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 20 Jan 2017 17:52:24 +0000 (17:52 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 20 Jan 2017 17:52:24 +0000 (17:52 +0000)

Trivial merge