From fa9bedc4aa22b13529b20474d01277726ce49f8c Mon Sep 17 00:00:00 2001 From: LIU Hao Date: Wed, 27 Nov 2024 11:51:18 +0800 Subject: [PATCH] atomic: Remove atomic.c --- mcfgthread/atomic.c | 11 ----------- mcfgthread/atomic.h | 5 +---- meson.build | 10 +++++----- 3 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 mcfgthread/atomic.c diff --git a/mcfgthread/atomic.c b/mcfgthread/atomic.c deleted file mode 100644 index 74cf0a5356..0000000000 --- a/mcfgthread/atomic.c +++ /dev/null @@ -1,11 +0,0 @@ -/* This file is part of MCF Gthread. - * Copyright (C) 2022-2024 LH_Mouse. All wrongs reserved. - * - * MCF Gthread is free software. Licensing information is included in - * LICENSE.TXT as a whole. The GCC Runtime Library Exception applies - * to this file. */ - -#include "xprecompiled.h" -#define __MCF_ATOMIC_IMPORT __MCF_DLLEXPORT -#define __MCF_ATOMIC_INLINE __MCF_ALWAYS_INLINE -#include "atomic.h" diff --git a/mcfgthread/atomic.h b/mcfgthread/atomic.h index 5b30eaff52..1dfbfae7d8 100644 --- a/mcfgthread/atomic.h +++ b/mcfgthread/atomic.h @@ -80,10 +80,7 @@ #endif /* __MCF_atomic */ __MCF_CXX(extern "C" {) -#ifndef __MCF_ATOMIC_IMPORT -# define __MCF_ATOMIC_IMPORT -# define __MCF_ATOMIC_INLINE __MCF_ALWAYS_INLINE -#endif +#define __MCF_ATOMIC_INLINE __MCF_ALWAYS_INLINE #pragma push_macro("WIDTH") #pragma push_macro("INTEGER") diff --git a/meson.build b/meson.build index ec274aabbe..243ab5d68e 100644 --- a/meson.build +++ b/meson.build @@ -32,11 +32,11 @@ mcfgthread_include = [ 'mcfgthread/cxx11.hpp' ] mcfgthread_src_min = [ - 'mcfgthread/xglobals.c', 'mcfgthread/fwd.c', 'mcfgthread/atomic.c', - 'mcfgthread/clock.c', 'mcfgthread/mutex.c', 'mcfgthread/shared_mutex.c', - 'mcfgthread/cond.c', 'mcfgthread/once.c', 'mcfgthread/sem.c', 'mcfgthread/event.c', - 'mcfgthread/thread.c', 'mcfgthread/cxa.c', 'mcfgthread/dtor_queue.c', - 'mcfgthread/exit.c', 'mcfgthread/tls.c', 'mcfgthread/gthr_aux.c' ] + 'mcfgthread/xglobals.c', 'mcfgthread/fwd.c', 'mcfgthread/clock.c', + 'mcfgthread/mutex.c', 'mcfgthread/shared_mutex.c', 'mcfgthread/cond.c', + 'mcfgthread/once.c', 'mcfgthread/sem.c', 'mcfgthread/event.c', 'mcfgthread/thread.c', + 'mcfgthread/cxa.c', 'mcfgthread/dtor_queue.c', 'mcfgthread/exit.c', + 'mcfgthread/tls.c', 'mcfgthread/gthr_aux.c' ] mcfgthread_src_ex = [ 'mcfgthread/gthr.c', 'mcfgthread/gthr_libobjc.c', 'mcfgthread/c11.c',