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

This is a forward port of the commit ed22b926b67429681841b6b0dc3d76daca1b451f that fixes the problem from the commit ed22b926b67429681841b6b0dc3d76daca1b451f.

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 a13fc9ee4bc49f945343ec789f950c023b015ddb..754e5881704eefe4dc4b8689a62f32902f12de0c 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 dc55a0b3cef64e1ff6e5497c0389ceeb83db4aa5..58880c0e142d4684d316156de10c173dbbc804de 100644 (file)
--- a/level_2/fll_program/c/program.c
+++ b/level_2/fll_program/c/program.c
@@ -541,7 +541,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) {