meson: always define whether headers exist

Combined with -Wundef (added in 75758d2ccf & enforced in ba17673eed),
this provides absolute safety against #ifdef typos.

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/Android.common.mk b/Android.common.mk
index d0e5d55..37c2b23 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -1,6 +1,9 @@
 # XXX: Consider moving these to config.h analogous to autoconf.
 LOCAL_CFLAGS += \
        -DMAJOR_IN_SYSMACROS=1 \
+       -DHAVE_ALLOCA_H=0 \
+       -DHAVE_SYS_SELECT_H=0 \
+       -DHAVE_SYS_SYSCTL_H=0 \
        -DHAVE_VISIBILITY=1 \
        -fvisibility=hidden \
        -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1

diff --git a/amdgpu/amdgpu_cs.c b/amdgpu/amdgpu_cs.c
index b4b7dcf..1bd974f 100644 (file)
--- a/amdgpu/amdgpu_cs.c
+++ b/amdgpu/amdgpu_cs.c
@@ -28,7 +28,7 @@
 #include <pthread.h>
 #include <sched.h>
 #include <sys/ioctl.h>
-#ifdef HAVE_ALLOCA_H
+#if HAVE_ALLOCA_H
 # include <alloca.h>
 #endif
 

diff --git a/meson.build b/meson.build
index 4468ac3..ddcb884 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -187,7 +187,7 @@ dep_m = cc.find_library('m', required : false)
 # FreeBSD requires sys/types.h for sys/sysctl.h, add it as part of the
 # includes when checking for headers.
 foreach header : ['sys/sysctl.h', 'sys/select.h', 'alloca.h']
-  config.set('HAVE_' + header.underscorify().to_upper(),
+  config.set10('HAVE_' + header.underscorify().to_upper(),
     cc.compiles('#include <sys/types.h>\n#include <@0@>'.format(header), name : '@0@ works'.format(header)))
 endforeach
 if (cc.has_header_symbol('sys/sysmacros.h', 'major') and

diff --git a/tests/amdgpu/basic_tests.c b/tests/amdgpu/basic_tests.c
index f5caf8d..57496c8 100644 (file)
--- a/tests/amdgpu/basic_tests.c
+++ b/tests/amdgpu/basic_tests.c
@@ -30,7 +30,7 @@
 #endif
 #include <sys/stat.h>
 #include <fcntl.h>
-#ifdef HAVE_ALLOCA_H
+#if HAVE_ALLOCA_H
 # include <alloca.h>
 #endif
 #include <sys/wait.h>

diff --git a/tests/amdgpu/deadlock_tests.c b/tests/amdgpu/deadlock_tests.c
index d6eb35b..a18d578 100644 (file)
--- a/tests/amdgpu/deadlock_tests.c
+++ b/tests/amdgpu/deadlock_tests.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#ifdef HAVE_ALLOCA_H
+#if HAVE_ALLOCA_H
 # include <alloca.h>
 #endif
 

diff --git a/tests/kms/kms-steal-crtc.c b/tests/kms/kms-steal-crtc.c
index cd40758..4d884c0 100644 (file)
--- a/tests/kms/kms-steal-crtc.c
+++ b/tests/kms/kms-steal-crtc.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <unistd.h>
-#ifdef HAVE_SYS_SELECT_H
+#if HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 

diff --git a/tests/kms/kms-universal-planes.c b/tests/kms/kms-universal-planes.c
index 2163c98..1d79388 100644 (file)
--- a/tests/kms/kms-universal-planes.c
+++ b/tests/kms/kms-universal-planes.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#ifdef HAVE_SYS_SELECT_H
+#if HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 

diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
index 09fd565..b907ab3 100644 (file)
--- a/tests/modetest/modetest.c
+++ b/tests/modetest/modetest.c
@@ -51,7 +51,7 @@
 #include <errno.h>
 #include <poll.h>
 #include <sys/time.h>
-#ifdef HAVE_SYS_SELECT_H
+#if HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 #include <math.h>

diff --git a/tests/vbltest/vbltest.c b/tests/vbltest/vbltest.c
index 48708d2..1c2b519 100644 (file)
--- a/tests/vbltest/vbltest.c
+++ b/tests/vbltest/vbltest.c
@@ -33,7 +33,7 @@
 #include <errno.h>
 #include <poll.h>
 #include <sys/time.h>
-#ifdef HAVE_SYS_SELECT_H
+#if HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 

diff --git a/xf86drmMode.c b/xf86drmMode.c
index 207d7be..0cf7992 100644 (file)
--- a/xf86drmMode.c
+++ b/xf86drmMode.c
@@ -42,7 +42,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
-#ifdef HAVE_SYS_SYSCTL_H
+#if HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>
 #endif
 #include <stdio.h>