Mesa (master): mesa: Fix NetBSD compiler macro.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jun 4 04:31:25 UTC 2020
Module: Mesa
Branch: master
Commit: c3025bde192919649999da202e7527849bf2038f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c3025bde192919649999da202e7527849bf2038f
Author: Vinson Lee <vlee at freedesktop.org>
Date: Sat May 23 13:46:28 2020 -0700
mesa: Fix NetBSD compiler macro.
Reported-by: Rafał Mikrut <mikrutrafal54 at gmail.com>
Fixes: a63b90712aad ("mesa: also check for __NetBSD__")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3015
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5191>
---
src/mapi/u_execmem.c | 2 +-
src/mesa/main/execmem.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mapi/u_execmem.c b/src/mapi/u_execmem.c
index 89d5c1d08d5..d6e64c08886 100644
--- a/src/mapi/u_execmem.c
+++ b/src/mapi/u_execmem.c
@@ -46,7 +46,7 @@ static unsigned int head = 0;
static unsigned char *exec_mem = (unsigned char *)0;
-#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__)
+#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__sun) || defined(__HAIKU__)
#include <unistd.h>
#include <sys/mman.h>
diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c
index b2018b5e767..a3e76c5d0b0 100644
--- a/src/mesa/main/execmem.c
+++ b/src/mesa/main/execmem.c
@@ -37,7 +37,7 @@
#include "c11/threads.h"
-#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__)
+#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__sun) || defined(__HAIKU__)
/*
* Allocate a large block of memory which can hold code then dole it out
More information about the mesa-commit
mailing list