From: Kevin Day Date: Mon, 15 Dec 2025 01:43:47 +0000 (-0600) Subject: Revert "Bugfix: Cannot disable f_thread_cancel() and f_thread_cancel_state_set()... X-Git-Tag: 0.7.4~5 X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=ee91e46643b82c565747468167afeb029df29cd6;p=kevux-firewall Revert "Bugfix: Cannot disable f_thread_cancel() and f_thread_cancel_state_set() on Android." This reverts commit 665227e2ed8aef9d3e33d16afb60566fa63fd640. The linking passed, but when I tried to run the program, it failed. I guess I cannot enable these. --- diff --git a/data/build/settings b/data/build/settings index ee5446a..f232d25 100644 --- a/data/build/settings +++ b/data/build/settings @@ -75,7 +75,7 @@ environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY L #defines -D_di_libcap_ defines -D_libcap_legacy_only_ -defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_ +defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_ -D_di_f_thread_cancel_state_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_ defines-debug -D_en_f_status_debug_ defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines-threadless -D_di_thread_support_ diff --git a/data/build/stand_alone/settings.firewall b/data/build/stand_alone/settings.firewall index 2d8c699..1f228ac 100644 --- a/data/build/stand_alone/settings.firewall +++ b/data/build/stand_alone/settings.firewall @@ -116,7 +116,7 @@ defines -include sources/c/config.h -I sources/c/ #defines -D_f_file_rename_use_renameat2_ #defines -D_di_libcap_ defines -D_libcap_legacy_only_ -defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_ +defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_ -D_di_f_thread_cancel_state_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_ defines-clang -D_clang_not_a_compile_time_constant_workaround_ defines-debug -D_en_f_status_debug_ defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_