Merge branch 'remove-unnecessary-define'

12 jobs for master in 341 minutes and 28 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #10364
i386 jessie debian
debian_jessie_i386_deb

00:29:52

passed #10365
x86_64 jessie debian
debian_jessie_x86_64_deb

00:36:39

passed #10366
x86_64 stretch debian
debian_stretch_x86_64_deb

00:30:51

passed #10370
dmg v10.11 osx
osx_10.11_x86_64_dmg

00:21:19

passed #10371
dmg v10.8 osx
osx_10.8_x86_64_dmg

00:21:16

passed #10373
stretch arm raspbian
raspbian_stretch_armv7l_deb

00:57:48

passed #10367
i386 v14.04 ubuntu
ubuntu_14.04_i386_deb

00:38:45

passed #10368
x86_64 v14.04 ubuntu
ubuntu_14.04_x86_64_deb

00:36:26

passed #10369
x86_64 v16.04 ubuntu
ubuntu_16.04_x86_64_deb

00:47:34

passed #10385
i386 windows
windows_i386_innosetup

01:18:39

failed #10384
windows i386
windows_i386_innosetup

01:07:17

failed #10372
i386 windows
windows_i386_innosetup

01:01:14