beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 00:50:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibC+AK: Remove our custom macros from <assert.h>

Browse source 
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.
This commit is contained in:
Gunnar Beutner 2021-06-07 14:00:29 +02:00 committed by Andreas Kling
parent c6ce7c9326
commit d2662df57c
Notes: sideshowbarker 2024-07-18 12:37:38 +09:00 
Author: https://github.com/gunnarbeutner
Commit: https://github.com/SerenityOS/serenity/commit/d2662df57c3
Pull-request: https://github.com/SerenityOS/serenity/pull/7874
Reviewed-by: https://github.com/awesomekling
Reviewed-by: https://github.com/gmta
5 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
AK/Assertions.h
View file

@ -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

1
AK/ByteBuffer.h
View file

@ -7,6 +7,7 @@
#pragma once
#include <AK/Assertions.h>
#include <AK/Span.h>
#include <AK/Types.h>
#include <AK/kmalloc.h>

1
AK/RefPtr.h
View file

@ -6,6 +6,7 @@
#pragma once
#include <AK/Assertions.h>
#include <AK/Atomic.h>
#include <AK/Format.h>
#include <AK/NonnullRefPtr.h>

4
Userland/Libraries/LibC/assert.h
View file

@ -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

2
Userland/Libraries/LibC/pthread_forward.cpp
View file

@ -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;