mirror of
https://git.yoctoproject.org/poky
synced 2026-09-24 22:36:21 +02:00
92b8d6e559
Drop 0001-Fix-build-issues-with-latest-Clang.patch (backport) 30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch (issue fixed upstream) Add an option that when absent causes a build failure. (From OE-Core rev: dc72933c3393339c7e8b50f62a16832aeac32887) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 6ab7d3f7d8d0d8e1ab401d0fb13f60bbc64279a2 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Klausner <wiz@gatalith.at>
|
|
Date: Thu, 7 Nov 2024 11:54:30 -0800
|
|
Subject: [PATCH] bmalloc: Build problem in bmalloc when X11/X.h is in the same
|
|
namespace https://bugs.webkit.org/show_bug.cgi?id=282693
|
|
|
|
This avoids a build problem when the X11/X.h is included,
|
|
which defines Success to '0'.
|
|
|
|
Reviewed by Fujii Hironori.
|
|
|
|
* Source/bmalloc/bmalloc/EligibilityResult.h:
|
|
|
|
Canonical link: https://commits.webkit.org/286295@main
|
|
Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/6ab7d3f7d8d0d8e1ab401d0fb13f60bbc64279a2]
|
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
|
---
|
|
Source/bmalloc/bmalloc/EligibilityResult.h | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/Source/bmalloc/bmalloc/EligibilityResult.h b/Source/bmalloc/bmalloc/EligibilityResult.h
|
|
index ead7dbb52c07a..48f9e5bfe8a80 100644
|
|
--- a/Source/bmalloc/bmalloc/EligibilityResult.h
|
|
+++ b/Source/bmalloc/bmalloc/EligibilityResult.h
|
|
@@ -29,6 +29,11 @@
|
|
|
|
#if !BUSE(LIBPAS)
|
|
|
|
+/* avoid conflict with symbol from X11 headers */
|
|
+#ifdef Success
|
|
+#undef Success
|
|
+#endif
|
|
+
|
|
namespace bmalloc {
|
|
|
|
enum class EligibilityKind {
|