From: Kevin Day <thekevinday@gmail.com>
Date: Fri, 13 Jan 2023 23:56:06 +0000 (-0600)
Subject: Bugfix: Incorrect macro definition _di_pthread_support_ vs _di_thread_support_.
X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=dcf35222b2337398975c5db094a96c1c4ac5dd2b;p=fll

Bugfix: Incorrect macro definition _di_pthread_support_ vs _di_thread_support_.

The _di_pthread_support_ is used in the project but all of the programs have _di_thread_support_.
The project name is f_thread and not f_pthread so favor _di_thread_support_ over _di_pthread_support_.
---

diff --git a/level_0/f_thread/data/build/defines b/level_0/f_thread/data/build/defines
index bd9bb11..29febee 100644
--- a/level_0/f_thread/data/build/defines
+++ b/level_0/f_thread/data/build/defines
@@ -1,5 +1,5 @@
 # fss-0000
 
-_di_pthread_support_ disables thread support, which is intended to disable this entire f_thread project. This is not directly used by this library, but is instead used by other libraries to not include f_thread (such as special compilations like monolithic). Future versions may potentially support this, providing stubs.
+_di_thread_support_ disables thread support, which is intended to disable this entire f_thread project. This is not directly used by this library, but is instead used by other libraries to not include f_thread (such as special compilations like monolithic). Future versions may potentially support this, providing stubs.
 _pthread_attr_unsupported_ Disable non-portable functionality associated with pthread_attr.
 _pthread_sigqueue_unsupported_ Disable GNU specific sigqueue().
diff --git a/level_2/fll_execute/c/execute.h b/level_2/fll_execute/c/execute.h
index a8acad4..244dcbc 100644
--- a/level_2/fll_execute/c/execute.h
+++ b/level_2/fll_execute/c/execute.h
@@ -43,9 +43,9 @@
 #include <fll/level_0/path.h>
 #include <fll/level_0/signal.h>
 
-#ifndef _di_pthread_support_
+#ifndef _di_thread_support_
   #include <fll/level_0/thread.h>
-#endif // _di_pthread_support_
+#endif // _di_thread_support_
 
 // FLL-1 includes.
 #include <fll/level_1/control_group.h>
diff --git a/level_2/fll_execute/c/private-execute.c b/level_2/fll_execute/c/private-execute.c
index 69f3943..50dbe65 100644
--- a/level_2/fll_execute/c/private-execute.c
+++ b/level_2/fll_execute/c/private-execute.c
@@ -300,10 +300,10 @@ extern "C" {
     }
 
     if (parameter && parameter->signals) {
-      #ifdef _di_pthread_support_
+      #ifdef _di_thread_support_
         f_signal_mask(SIG_BLOCK, &parameter->signals->block, 0);
         f_signal_mask(SIG_UNBLOCK, &parameter->signals->block_not, 0);
-      #else // _di_pthread_support_
+      #else // _di_thread_support_
         if (parameter->option & FL_execute_parameter_option_threadsafe_d) {
           f_thread_signal_mask(SIG_BLOCK, &parameter->signals->block, 0);
           f_thread_signal_mask(SIG_UNBLOCK, &parameter->signals->block_not, 0);
@@ -312,7 +312,7 @@ extern "C" {
           f_signal_mask(SIG_BLOCK, &parameter->signals->block, 0);
           f_signal_mask(SIG_UNBLOCK, &parameter->signals->block_not, 0);
         }
-      #endif // _di_pthread_support_
+      #endif // _di_thread_support_
     }
 
     if (parameter && parameter->environment) {
@@ -488,10 +488,10 @@ extern "C" {
     }
 
     if (parameter && parameter->signals) {
-      #ifdef _di_pthread_support_
+      #ifdef _di_thread_support_
         f_signal_mask(SIG_BLOCK, &parameter->signals->block, 0);
         f_signal_mask(SIG_UNBLOCK, &parameter->signals->block_not, 0);
-      #else // _di_pthread_support_
+      #else // _di_thread_support_
         if (parameter->option & FL_execute_parameter_option_threadsafe_d) {
           f_thread_signal_mask(SIG_BLOCK, &parameter->signals->block, 0);
           f_thread_signal_mask(SIG_UNBLOCK, &parameter->signals->block_not, 0);
@@ -500,7 +500,7 @@ extern "C" {
           f_signal_mask(SIG_BLOCK, &parameter->signals->block, 0);
           f_signal_mask(SIG_UNBLOCK, &parameter->signals->block_not, 0);
         }
-      #endif // _di_pthread_support_
+      #endif // _di_thread_support_
     }
 
     if (parameter && parameter->environment) {
diff --git a/level_2/fll_execute/data/build/defines b/level_2/fll_execute/data/build/defines
index 6a045ca..649b88b 100644
--- a/level_2/fll_execute/data/build/defines
+++ b/level_2/fll_execute/data/build/defines
@@ -1,6 +1,6 @@
 # fss-0000
 
 _di_libcap_ Disable libcap support, allow for compiling and linking without libcap (-lcap).
-_di_pthread_support_ Disable support for compiling and depending on pthreads (and projects like f_thread).
+_di_thread_support_ Disable support for compiling and depending on pthreads (and projects like f_thread).
 _pthread_attr_unsupported_ Disable non-portable functionality associated with pthread_attr.
 _pthread_sigqueue_unsupported_ Disable GNU specific sigqueue().
diff --git a/level_2/fll_execute/data/build/settings b/level_2/fll_execute/data/build/settings
index ec1d751..f676f4f 100644
--- a/level_2/fll_execute/data/build/settings
+++ b/level_2/fll_execute/data/build/settings
@@ -51,7 +51,7 @@ environment PATH LD_LIBRARY_PATH
 
 #defines -D_di_libcap_
 defines -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_
-defines-individual_threadless -D_di_pthread_support_
+defines-individual_threadless -D_di_thread_support_
 
 flags -O2 -z now -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-parentheses
 flags-clang -Wno-logical-op-parentheses