Mesa (master): util: Disable memstream for Apple builds

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jan 8 09:56:30 UTC 2021


Module: Mesa
Branch: master
Commit: 3fb4755d48d079d47ca212a838d16259db2abcfa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3fb4755d48d079d47ca212a838d16259db2abcfa

Author: James Park <jpark37 at lagfreegames.com>
Date:   Wed Dec 30 05:23:10 2020 -0800

util: Disable memstream for Apple builds

Not all SDK versions support open_memstream. Maybe some other day.

Fixes: af8d488ea5e ("util,ac,aco,radv: Cross-platform memstream API")
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8269>

---

 src/util/memstream.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/util/memstream.c b/src/util/memstream.c
index f133a527341..8840228563a 100644
--- a/src/util/memstream.c
+++ b/src/util/memstream.c
@@ -30,7 +30,7 @@
 bool
 u_memstream_open(struct u_memstream *mem, char **bufp, size_t *sizep)
 {
-#ifdef _WIN32
+#if defined(_WIN32)
    bool success = false;
 
    char path[MAX_PATH];
@@ -51,6 +51,8 @@ u_memstream_open(struct u_memstream *mem, char **bufp, size_t *sizep)
    }
 
    return success;
+#elif defined(__APPLE__)
+   return false;
 #else
    FILE *const f = open_memstream(bufp, sizep);
    mem->f = f;



More information about the mesa-commit mailing list