Bugfix: The fll_program_standard_signal_received() changes are incomplete and break...

The commit ed22b926b67429681841b6b0dc3d76daca1b451f introduced incomplete settings.

I forgot to update the new "stand alone" build settings with the new private source file.
The tests now use this "stand alone" build for building fake and using that fake to perform the tests.

Fix a problem with existing code that has incorrect macros.

diff --git a/build/stand_alone/fake.settings b/build/stand_alone/fake.settings
index cf955b2f1ff9a5a3c3ad854ba9288dde6bc01ba6..141b2dd39ca89517e8c16f1458bcccd4a1552712 100644 (file)
--- a/build/stand_alone/fake.settings
+++ b/build/stand_alone/fake.settings
@@ -63,7 +63,7 @@ build_sources_program fll/level_2/fss.c fll/level_2/fss/basic.c fll/level_2/fss/
 build_sources_program fll/level_2/iki.c fll/level_2/private-iki.c
 build_sources_program fll/level_2/path.c
 build_sources_program fll/level_2/print.c
-build_sources_program fll/level_2/program.c fll/level_2/program/common.c
+build_sources_program fll/level_2/program.c fll/level_2/program/common.c fll/level_2/private-program.c
 
 build_sources_program program/fake/fake.c program/fake/common.c
 build_sources_program program/fake/private-build.c program/fake/private-build-library.c program/fake/private-build-load.c program/fake/private-build-object.c program/fake/private-build-objects.c program/fake/private-build-program.c program/fake/private-build-skeleton.c

diff --git a/build/stand_alone/utf8.settings b/build/stand_alone/utf8.settings
index ad9f51b0fbd6a8e60625ffe4c484f64ff916a6c4..0b604a652b3015b8edd01993fc3af517fdb621b9 100644 (file)
--- a/build/stand_alone/utf8.settings
+++ b/build/stand_alone/utf8.settings
@@ -43,7 +43,7 @@ build_sources_program fll/level_1/string.c fll/level_1/private-string.c
 
 build_sources_program fll/level_2/error.c fll/level_2/error/common.c fll/level_2/private-error.c
 build_sources_program fll/level_2/print.c
-build_sources_program fll/level_2/program.c fll/level_2/program/common.c
+build_sources_program fll/level_2/program.c fll/level_2/program/common.c fll/level_2/private-program.c
 
 build_sources_program program/utf8/utf8.c program/utf8/common.c program/utf8/private-common.c program/utf8/private-print.c program/utf8/private-utf8.c program/utf8/private-utf8_bytesequence.c program/utf8/private-utf8_codepoint.c
 

diff --git a/level_2/fll_program/c/program.c b/level_2/fll_program/c/program.c
index 9c49aeb5be92942c9a6d1f69cc460fc14ea9ad2c..386bd66cb67246781e7f4c68c853562ba16a7445 100644 (file)
--- a/level_2/fll_program/c/program.c
+++ b/level_2/fll_program/c/program.c
@@ -367,7 +367,7 @@ extern "C" {
 
     return private_fll_program_standard_signal_received(main);
   }
-#endif // _di_fss_basic_read_signal_received_
+#endif // _di_fll_program_standard_signal_received_
 
 #ifndef _di_fll_program_standard_signal_state_
   f_status_t fll_program_standard_signal_state(void * const state, void * const internal) {

diff --git a/level_2/fll_program/c/program.h b/level_2/fll_program/c/program.h
index 7db8b03a225c459bfef9d5fab6427fbc70b96f54..a141410d6bad315fddcfa3021ecdb423b7897084 100644 (file)
--- a/level_2/fll_program/c/program.h
+++ b/level_2/fll_program/c/program.h
@@ -445,9 +445,9 @@ extern "C" {
  *
  * @see f_signal_read()
  */
-#ifndef _di_fss_basic_read_signal_received_
+#ifndef _di_fll_program_standard_signal_received_
   extern f_status_t fll_program_standard_signal_received(fll_program_data_t * const main);
-#endif // _di_fss_basic_read_signal_received_
+#endif // _di_fll_program_standard_signal_received_
 
 /**
  * Standardized callback for checking for interrupts via the f_state_t interrupt callback.