summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Nygren <[email protected]>2015-04-17 20:27:55 +0200
committerMatt Turner <[email protected]>2015-04-17 12:04:48 -0700
commitcfab4ea9c654819c96272a62d7b1664e9038fe91 (patch)
tree322be9dda2d033cfdc3e82adc6e735210568f9ad
parent52e4e4712f0da7e7e1d1164d9487f2d38f80c441 (diff)
adjust a couple of ifdefs to handle NetBSD correctly
Acked-by: Matt Turner <[email protected]> Signed-off-by: Tobias Nygren <[email protected]>
-rw-r--r--src/gallium/include/pipe/p_config.h2
-rw-r--r--src/mesa/drivers/dri/common/xmlconfig.c2
-rw-r--r--src/mesa/x86/common_x86.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h
index 5b6db7dcc67..794aabe85f2 100644
--- a/src/gallium/include/pipe/p_config.h
+++ b/src/gallium/include/pipe/p_config.h
@@ -157,7 +157,7 @@
# define PIPE_ARCH_BIG_ENDIAN
#endif
-#elif defined(__OpenBSD__)
+#elif defined(__OpenBSD__) || defined(__NetBSD__)
#include <sys/types.h>
#include <machine/endian.h>
diff --git a/src/mesa/drivers/dri/common/xmlconfig.c b/src/mesa/drivers/dri/common/xmlconfig.c
index 2b284ccf28f..f17693e739f 100644
--- a/src/mesa/drivers/dri/common/xmlconfig.c
+++ b/src/mesa/drivers/dri/common/xmlconfig.c
@@ -56,7 +56,7 @@ extern char *program_invocation_name, *program_invocation_short_name;
# include <stdlib.h>
# define GET_PROGRAM_NAME() getprogname()
# endif
-#elif defined(__NetBSD__) && defined(__NetBSD_Version) && (__NetBSD_Version >= 106000100)
+#elif defined(__NetBSD__) && defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106000100)
# include <stdlib.h>
# define GET_PROGRAM_NAME() getprogname()
#elif defined(__APPLE__)
diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c
index 86fbca91e6e..1c8640514ab 100644
--- a/src/mesa/x86/common_x86.c
+++ b/src/mesa/x86/common_x86.c
@@ -42,7 +42,7 @@
#include <sys/types.h>
#include <sys/sysctl.h>
#endif
-#if defined(USE_SSE_ASM) && defined(__OpenBSD__)
+#if defined(USE_SSE_ASM) && (defined(__OpenBSD__) || defined(__NetBSD__))
#include <sys/param.h>
#include <sys/sysctl.h>
#include <machine/cpu.h>