From d2662df57c32464c3b0a1d0cf12a61fda822cfbd Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gbeutner@serenityos.org>
Date: Mon, 7 Jun 2021 14:00:29 +0200
Subject: [PATCH] LibC+AK: Remove our custom macros from <assert.h>

Other software might not expect these to be defined and behave
differently if they _are_ defined, e.g. scummvm which checks if
the TODO macro is defined and fails to build if it is.
---
 AK/Assertions.h                             | 8 +++-----
 AK/ByteBuffer.h                             | 1 +
 AK/RefPtr.h                                 | 1 +
 Userland/Libraries/LibC/assert.h            | 4 ----
 Userland/Libraries/LibC/pthread_forward.cpp | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/AK/Assertions.h b/AK/Assertions.h
index e91e0f8d21..4aee5d8429 100644
--- a/AK/Assertions.h
+++ b/AK/Assertions.h
@@ -10,9 +10,7 @@
 #    include <Kernel/Assertions.h>
 #else
 #    include <assert.h>
-#    ifndef __serenity__
-#        define VERIFY assert
-#        define VERIFY_NOT_REACHED() assert(false)
-#        define TODO VERIFY_NOT_REACHED
-#    endif
+#    define VERIFY assert
+#    define VERIFY_NOT_REACHED() assert(false)
+#    define TODO VERIFY_NOT_REACHED
 #endif
diff --git a/AK/ByteBuffer.h b/AK/ByteBuffer.h
index 6bdfe300f6..1480a57405 100644
--- a/AK/ByteBuffer.h
+++ b/AK/ByteBuffer.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <AK/Assertions.h>
 #include <AK/Span.h>
 #include <AK/Types.h>
 #include <AK/kmalloc.h>
diff --git a/AK/RefPtr.h b/AK/RefPtr.h
index 5a4ddd1fd6..66815279dc 100644
--- a/AK/RefPtr.h
+++ b/AK/RefPtr.h
@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <AK/Assertions.h>
 #include <AK/Atomic.h>
 #include <AK/Format.h>
 #include <AK/NonnullRefPtr.h>
diff --git a/Userland/Libraries/LibC/assert.h b/Userland/Libraries/LibC/assert.h
index 1a929e067a..b9756a46e8 100644
--- a/Userland/Libraries/LibC/assert.h
+++ b/Userland/Libraries/LibC/assert.h
@@ -19,7 +19,6 @@ __BEGIN_DECLS
             if (__builtin_expect(!(expr), 0))                                      \
                 __assertion_failed(#expr "\n" __FILE__ ":" __stringify(__LINE__)); \
         } while (0)
-#    define VERIFY_NOT_REACHED() assert(false)
 #else
 #    define assert(expr) ((void)(0))
 #    define VERIFY_NOT_REACHED() _abort()
@@ -27,9 +26,6 @@ __BEGIN_DECLS
 
 [[noreturn]] void _abort();
 
-#define VERIFY assert
-#define TODO VERIFY_NOT_REACHED
-
 #ifndef __cplusplus
 #    define static_assert _Static_assert
 #endif
diff --git a/Userland/Libraries/LibC/pthread_forward.cpp b/Userland/Libraries/LibC/pthread_forward.cpp
index b379c6ca97..e610613cbb 100644
--- a/Userland/Libraries/LibC/pthread_forward.cpp
+++ b/Userland/Libraries/LibC/pthread_forward.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibC/assert.h>
+#include <AK/Assertions.h>
 #include <LibC/bits/pthread_forward.h>
 
 static PthreadFunctions s_pthread_functions;