amalgamation fixes

Author: SamuelMarks

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
           cmake --build build
 
       - name: Compile Test Amalgamation
-        run: gcc -Wall -Wextra -Werror -Ibuild/c89stringutils -o test_amalg c89stringutils/tests/test_amalg.c
+        run: gcc -Wall -Wextra -Werror -Ibuild -o test_amalg c89stringutils/tests/test_amalg.c
 
       - name: Run Test Amalgamation
         run: ./test_amalg

CMakeLists.txt

@@ -25,13 +25,13 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15")
     target_compile_options(
             "${PROJECT_NAME}_compiler_flags"
             INTERFACE
-            "$<$<AND:${gcc_like},$<CONFIG:Debug>>:$<BUILD_INTERFACE:-Wshadow;-Wformat=2;-Wall;-Wno-missing-braces;-Wno-long-long;-pedantic;-fprofile-arcs;-ftest-coverage>>"
+            "$<$<AND:${gcc_like},$<CONFIG:Debug>>:$<BUILD_INTERFACE:-Wshadow;-Wformat=2;-Wall;-Wno-missing-braces;-Wno-long-long;-pedantic;>>"
             "$<${msvc}:$<BUILD_INTERFACE:-W4;-WX;-Zi;-permissive->>"
     )
     target_link_options(
             "${PROJECT_NAME}_compiler_flags"
             INTERFACE
-            "$<$<AND:${gcc_like},$<CONFIG:Debug>>:$<BUILD_INTERFACE:--coverage>>"
+            "$<$<AND:${gcc_like},$<CONFIG:Debug>>:$<BUILD_INTERFACE:>>"
     )
 endif (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15")
 # Set the build directories

c89stringutils/c89stringutils_safecrt.h

@@ -11,7 +11,10 @@
 #include "c89stringutils_string_extras.h"
 #include <stddef.h>
 #include <stdio.h>
+
+#if defined(C89STRINGUTILS_HAVE_WCHAR_H)
 #include <wchar.h>
+#endif
 
 #if defined(C89STRINGUTILS_HAVE_SET_CONSTRAINT_HANDLER_S)
 #include <stdlib.h>
@@ -20,7 +23,7 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif /* __cplusplus */
 
 #if defined(C89STRINGUTILS_HAVE_SET_CONSTRAINT_HANDLER_S)
 #define c89stringutils_constraint_handler_t constraint_handler_t