diff options
| author | Vinson Lee <vlee@freedesktop.org> | 2020-05-23 13:46:28 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-06-09 11:02:04 -0700 |
| commit | 2dc59d1dd535592466ed8e46a0970b1549490389 (patch) | |
| tree | 7711d3adee93da37925d2f6fe36caf0d04aefb2b | |
| parent | 8edafd6aae7d0b79dcbee416b5ead74deb05829e (diff) | |
| download | mesa-2dc59d1dd535592466ed8e46a0970b1549490389.tar.gz | |
mesa: Fix NetBSD compiler macro.
Reported-by: Rafał Mikrut <mikrutrafal54@gmail.com>
Fixes: a63b90712aad ("mesa: also check for __NetBSD__")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3015
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5191>
(cherry picked from commit c3025bde192919649999da202e7527849bf2038f)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/mapi/u_execmem.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/execmem.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json index 57ee9718302..0d2961a64a4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1012,7 +1012,7 @@ "description": "mesa: Fix NetBSD compiler macro.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "a63b90712aad81d544eb8931493a6c4a7805f7fb" }, 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 35d4574ba2b..c9d25aa7d62 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 |