diff --git a/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj b/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj index 23a91437..310a8183 100644 --- a/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj +++ b/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj @@ -756,7 +756,6 @@ - @@ -1233,7 +1232,6 @@ - diff --git a/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj.filters b/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj.filters index 22edf464..f227c00b 100644 --- a/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj.filters +++ b/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj.filters @@ -719,7 +719,6 @@ src src src - src src src src @@ -1196,7 +1195,6 @@ src src src - src src src src diff --git a/mk_clib/src/mk_sl_io_transaction.c b/mk_clib/src/mk_sl_io_transaction.c index 50b13c36..70c5c4e0 100644 --- a/mk_clib/src/mk_sl_io_transaction.c +++ b/mk_clib/src/mk_sl_io_transaction.c @@ -15,14 +15,7 @@ #define mk_sl_io_transaction_impl_abort mk_sl_io_transaction_windows_abort #define mk_sl_io_transaction_impl_close mk_sl_io_transaction_windows_close #define mk_sl_io_transaction_impl_dummy mk_sl_io_transaction_windows_dummy -#elif mk_lang_platform == mk_lang_platform_linux -#include "mk_sl_io_transaction_linux.h" -#define mk_sl_io_transaction_impl_create mk_sl_io_transaction_linux_create -#define mk_sl_io_transaction_impl_commit mk_sl_io_transaction_linux_commit -#define mk_sl_io_transaction_impl_abort mk_sl_io_transaction_linux_abort -#define mk_sl_io_transaction_impl_close mk_sl_io_transaction_linux_close -#define mk_sl_io_transaction_impl_dummy mk_sl_io_transaction_linux_dummy -#elif mk_lang_platform == mk_lang_platform_portable +#elif mk_lang_platform == mk_lang_platform_linux || mk_lang_platform == mk_lang_platform_portable #include "mk_sl_io_transaction_portable.h" #define mk_sl_io_transaction_impl_create mk_sl_io_transaction_portable_create #define mk_sl_io_transaction_impl_commit mk_sl_io_transaction_portable_commit diff --git a/mk_clib/src/mk_sl_io_transaction.h b/mk_clib/src/mk_sl_io_transaction.h index 416ec82a..a6ed641a 100644 --- a/mk_clib/src/mk_sl_io_transaction.h +++ b/mk_clib/src/mk_sl_io_transaction.h @@ -12,10 +12,7 @@ #if mk_lang_platform == mk_lang_platform_windows_61 || mk_lang_platform == mk_lang_platform_windows_60 || mk_lang_platform == mk_lang_platform_windows #include "mk_sl_io_transaction_windows.h" struct mk_sl_io_transaction_s { mk_sl_io_transaction_windows_t m_data; }; -#elif mk_lang_platform == mk_lang_platform_linux -#include "mk_sl_io_transaction_linux.h" -struct mk_sl_io_transaction_s { mk_sl_io_transaction_linux_t m_data; }; -#elif mk_lang_platform == mk_lang_platform_portable +#elif mk_lang_platform == mk_lang_platform_linux || mk_lang_platform == mk_lang_platform_portable #include "mk_sl_io_transaction_portable.h" struct mk_sl_io_transaction_s { mk_sl_io_transaction_portable_t m_data; }; #else diff --git a/mk_clib/src/mk_sl_io_transaction_linux.c b/mk_clib/src/mk_sl_io_transaction_linux.c deleted file mode 100644 index f5d57f6d..00000000 --- a/mk_clib/src/mk_sl_io_transaction_linux.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "mk_sl_io_transaction_linux.h" - -#include "mk_lang_assert.h" -#include "mk_lang_bool.h" -#include "mk_lang_check.h" -#include "mk_lang_jumbo.h" -#include "mk_lang_nodiscard.h" -#include "mk_lang_noexcept.h" -#include "mk_lang_types.h" - - -mk_lang_nodiscard mk_lang_jumbo mk_lang_types_sint_t mk_sl_io_transaction_linux_create(mk_sl_io_transaction_linux_pt const transaction) mk_lang_noexcept -{ - mk_lang_assert(transaction); - - mk_lang_check_return(mk_lang_false); - return 0; -} - -mk_lang_nodiscard mk_lang_jumbo mk_lang_types_sint_t mk_sl_io_transaction_linux_commit(mk_sl_io_transaction_linux_pt const transaction) mk_lang_noexcept -{ - mk_lang_assert(transaction); - - if(transaction->m_dummy != -1) - { - } - return 0; -} - -mk_lang_nodiscard mk_lang_jumbo mk_lang_types_sint_t mk_sl_io_transaction_linux_abort(mk_sl_io_transaction_linux_pt const transaction) mk_lang_noexcept -{ - mk_lang_assert(transaction); - - if(transaction->m_dummy != -1) - { - } - return 0; -} - -mk_lang_nodiscard mk_lang_jumbo mk_lang_types_sint_t mk_sl_io_transaction_linux_close(mk_sl_io_transaction_linux_pt const transaction) mk_lang_noexcept -{ - mk_lang_assert(transaction); - - if(transaction->m_dummy != -1) - { - } - return 0; -} - -mk_lang_nodiscard mk_lang_jumbo mk_lang_types_sint_t mk_sl_io_transaction_linux_dummy(mk_sl_io_transaction_linux_pt const transaction) mk_lang_noexcept -{ - mk_lang_assert(transaction); - - transaction->m_dummy = -1; - return 0; -} diff --git a/mk_clib/src/mk_sl_io_transaction_linux.h b/mk_clib/src/mk_sl_io_transaction_linux.h deleted file mode 100644 index 44807b2b..00000000 --- a/mk_clib/src/mk_sl_io_transaction_linux.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef mk_include_guard_mk_sl_io_transaction_linux -#define mk_include_guard_mk_sl_io_transaction_linux - - -#include "mk_lang_jumbo.h" -#include "mk_lang_nodiscard.h" -#include "mk_lang_noexcept.h" -#include "mk_lang_types.h" - - -struct mk_sl_io_transaction_linux_s -{ - mk_lang_types_sint_t m_dummy; -}; -typedef struct mk_sl_io_transaction_linux_s mk_sl_io_transaction_linux_t; -typedef mk_sl_io_transaction_linux_t const mk_sl_io_transaction_linux_ct; -typedef mk_sl_io_transaction_linux_t* mk_sl_io_transaction_linux_pt; -typedef mk_sl_io_transaction_linux_t const* mk_sl_io_transaction_linux_pct; - - -mk_lang_nodiscard mk_lang_jumbo mk_lang_types_sint_t mk_sl_io_transaction_linux_create(mk_sl_io_transaction_linux_pt const transaction) mk_lang_noexcept; -mk_lang_nodiscard mk_lang_jumbo mk_lang_types_sint_t mk_sl_io_transaction_linux_commit(mk_sl_io_transaction_linux_pt const transaction) mk_lang_noexcept; -mk_lang_nodiscard mk_lang_jumbo mk_lang_types_sint_t mk_sl_io_transaction_linux_abort(mk_sl_io_transaction_linux_pt const transaction) mk_lang_noexcept; -mk_lang_nodiscard mk_lang_jumbo mk_lang_types_sint_t mk_sl_io_transaction_linux_close(mk_sl_io_transaction_linux_pt const transaction) mk_lang_noexcept; -mk_lang_nodiscard mk_lang_jumbo mk_lang_types_sint_t mk_sl_io_transaction_linux_dummy(mk_sl_io_transaction_linux_pt const transaction) mk_lang_noexcept; - - -#if mk_lang_jumbo_want == 1 -#include "mk_sl_io_transaction_linux.c" -#endif -#endif