[acquire/CMakeLists.txt] Ensure LIBACQUIRE_ACQUIRE_FILEUTILS_IMPL is only defined in one translation unit to fix linkage duplication error ; [*.h] Combine ifdef LIBACQUIRE_IMPLEMENTATION with IMPL condition ; [acquire/tests] Include stdbool the way I've made standard

SamuelMarks · SamuelMarks · commit 6e1ca3c9bfb3 · 2025-06-05T12:35:58.000-06:00
diff --git a/acquire/CMakeLists.txt b/acquire/CMakeLists.txt
@@ -178,7 +178,7 @@ else ()
         elseif (src MATCHES "/gen_acquire_fileutils.c$")
             set_source_files_properties(
                     ${src} PROPERTIES
-                    COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION;LIBACQUIRE_IMPL_ACQUIRE_FILEUTILS=1"
+                    COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION;LIBACQUIRE_ACQUIRE_FILEUTILS_IMPL=1"
             )
         elseif (src MATCHES "/gen_acquire_libcurl.c$")
             set_source_files_properties(
@@ -223,7 +223,7 @@ else ()
         elseif (src MATCHES "/gen_acquire_url_utils.c$")
             set_source_files_properties(
                     ${src} PROPERTIES
-                    COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION;LIBACQUIRE_IMPL_ACQUIRE_FILEUTILS=1"
+                    COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION"
             )
         elseif (src MATCHES "/gen_acquire_extract.c$")
             # For extract, could detect MINIZ or LIBARCHIVE
diff --git a/acquire/acquire_extract.h b/acquire/acquire_extract.h
@@ -59,9 +59,7 @@ extern LIBACQUIRE_EXPORT int extract_archive(enum Archive archive,
  */
 extern LIBACQUIRE_EXPORT enum Archive extension2archive(const char *extension);
 
-#ifdef LIBACQUIRE_IMPLEMENTATION
-#ifndef LIBACQUIRE_IMPL_ACQUIRE_EXTRACT_H
-#define LIBACQUIRE_IMPL_ACQUIRE_EXTRACT_H
+#if defined(LIBACQUIRE_IMPLEMENTATION) && defined(LIBACQUIRE_EXTRACT_IMPL)
 #include <acquire_string_extras.h>
 
 enum Archive extension2archive(const char *const extension) {
@@ -73,8 +71,8 @@ enum Archive extension2archive(const char *const extension) {
     return LIBACQUIRE_INFER;
 }
 
-#endif /* !LIBACQUIRE_IMPL_ACQUIRE_EXTRACT_H */
-#endif /* LIBACQUIRE_IMPLEMENTATION */
+#endif /* defined(LIBACQUIRE_IMPLEMENTATION) &&                                \
+          defined(LIBACQUIRE_EXTRACT_IMPL) */
 
 #ifdef __cplusplus
 }
diff --git a/acquire/acquire_fileutils.h b/acquire/acquire_fileutils.h
@@ -26,8 +26,8 @@ extern "C" {
 
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
 
-#include <acquire_common_defs.h>
 #include <Fileapi.h>
+#include <acquire_common_defs.h>
 #include <io.h>
 #include <wchar.h>
 
@@ -80,8 +80,8 @@ extern LIBACQUIRE_EXPORT bool is_relative(const char *path);
  */
 extern LIBACQUIRE_EXPORT const char *get_extension(const char *path);
 
-#ifdef LIBACQUIRE_IMPLEMENTATION
-#ifdef LIBACQUIRE_IMPL_ACQUIRE_FILEUTILS
+#if defined(LIBACQUIRE_IMPLEMENTATION) &&                                      \
+    defined(LIBACQUIRE_ACQUIRE_FILEUTILS_IMPL)
 
 bool is_directory(const char *const path) {
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
@@ -160,8 +160,8 @@ const char *get_extension(const char *const filename) {
   return strncmp(ext0, ".tar", 4) == 0 ? ext0 : ext1;
 }
 
-#endif /* LIBACQUIRE_IMPL_ACQUIRE_FILEUTILS */
-#endif /* LIBACQUIRE_IMPLEMENTATION */
+#endif /* defined(LIBACQUIRE_IMPLEMENTATION) &&                                \
+          defined(LIBACQUIRE_ACQUIRE_FILEUTILS_IMPL) */
 
 #ifdef __cplusplus
 }
diff --git a/acquire/acquire_libarchive.h b/acquire/acquire_libarchive.h
@@ -1,8 +1,7 @@
 #if !defined(LIBACQUIRE_ACQUIRE_LIBARCHIVE_H) && defined(USE_LIBARCHIVE) &&    \
-    defined(LIBACQUIRE_IMPLEMENTATION) &&                                      \
-    !defined(LIBACQUIRE_ACQUIRE_EXTRACT_IMPL)
+    defined(LIBACQUIRE_IMPLEMENTATION) && !defined(LIBACQUIRE_EXTRACT_IMPL)
 #define LIBACQUIRE_ACQUIRE_LIBARCHIVE_H
-#define LIBACQUIRE_ACQUIRE_EXTRACT_IMPL
+#define LIBACQUIRE_EXTRACT_IMPL
 
 /* Note this file is mostly the
  * https://github.com/libarchive/libarchive/wiki/Examples#a-complete-extractor
@@ -114,4 +113,4 @@ int extract_archive(enum Archive archive, const char *archive_filepath,
 
 #endif /* !defined(LIBACQUIRE_ACQUIRE_LIBARCHIVE_H) && defined(USE_LIBARCHIVE) \
           && defined(LIBACQUIRE_IMPLEMENTATION) &&                             \
-          !defined(LIBACQUIRE_ACQUIRE_EXTRACT_IMPL) */
+          !defined(LIBACQUIRE_EXTRACT_IMPL) */
diff --git a/acquire/acquire_librhash.h b/acquire/acquire_librhash.h
@@ -44,25 +44,25 @@ int hash_file(const char *filepath, const enum rhash_ids hash_id,
   }
 }
 
-#if !defined(LIBACQUIRE_IMPL_SHA256) && !defined(CRYPTO_LIB)
-#define LIBACQUIRE_IMPL_SHA256
+#if !defined(LIBACQUIRE_SHA256_IMPL) && !defined(CRYPTO_LIB)
+#define LIBACQUIRE_SHA256_IMPL
 bool sha256(const char *filename, const char *gold_hash) {
   char gen_hash[130], digest[64];
   return hash_file(filename, RHASH_SHA256, RHPR_HEX, digest, gen_hash) < 0
              ? false
              : strcmp(gen_hash, gold_hash) == 0;
 }
-#endif /* !defined(LIBACQUIRE_IMPL_SHA256) && !defined(CRYPTO_LIB) */
+#endif /* !defined(LIBACQUIRE_SHA256_IMPL) && !defined(CRYPTO_LIB) */
 
-#if !defined(LIBACQUIRE_IMPL_SHA512) && !defined(CRYPTO_LIB)
-#define LIBACQUIRE_IMPL_SHA512
+#if !defined(LIBACQUIRE_SHA512_IMPL) && !defined(CRYPTO_LIB)
+#define LIBACQUIRE_SHA512_IMPL
 bool sha512(const char *filename, const char *gold_hash) {
   char gen_hash[130], digest[64];
   return hash_file(filename, RHASH_SHA512, RHPR_HEX, digest, gen_hash) < 0
              ? false
              : strcmp(gen_hash, gold_hash) == 0;
 }
-#endif /* !defined(LIBACQUIRE_IMPL_SHA512) && !defined(CRYPTO_LIB) */
+#endif /* !defined(LIBACQUIRE_SHA512_IMPL) && !defined(CRYPTO_LIB) */
 
 /* X(sha256, RHASH_SHA256, comma) \ */
 /* X(sha512, RHASH_SHA512, comma) \ */
diff --git a/acquire/acquire_miniz.h b/acquire/acquire_miniz.h
@@ -1,8 +1,7 @@
 #if !defined(LIBACQUIRE_ACQUIRE_MINIZ_H) && defined(USE_MINIZ) &&              \
-    defined(LIBACQUIRE_IMPLEMENTATION) &&                                      \
-    !defined(LIBACQUIRE_ACQUIRE_EXTRACT_IMPL)
+    defined(LIBACQUIRE_IMPLEMENTATION) && !defined(LIBACQUIRE_EXTRACT_IMPL)
 #define LIBACQUIRE_ACQUIRE_MINIZ_H
-#define LIBACQUIRE_ACQUIRE_EXTRACT_IMPL
+#define LIBACQUIRE_EXTRACT_IMPL
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,4 +43,4 @@ int extract_archive(enum Archive archive, const char *archive_filepath,
 
 #endif /* !defined(LIBACQUIRE_ACQUIRE_MINIZ_H) && defined(USE_MINIZ) &&        \
           defined(LIBACQUIRE_IMPLEMENTATION)  &&                               \
-          !defined(LIBACQUIRE_ACQUIRE_EXTRACT_IMPL) */
+          !defined(LIBACQUIRE_EXTRACT_IMPL) */
diff --git a/acquire/acquire_net_common.h b/acquire/acquire_net_common.h
@@ -12,8 +12,8 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include "acquire_config.h"
 #include "acquire_common_defs.h"
+#include "acquire_config.h"
 
 /**
  * Check if a file represented by URL is already downloaded locally and matches
@@ -32,11 +32,11 @@ extern LIBACQUIRE_EXPORT bool is_downloaded(const char *url,
                                             const char *target_location);
 
 #if defined(LIBACQUIRE_IMPLEMENTATION) &&                                      \
-    !defined(LIBACQUIRE_IMPL_ACQUIRE_NET_COMMON)
-#include "acquire_config.h"
+    !defined(LIBACQUIRE_ACQUIRE_NET_COMMON_IMPL)
 #include "acquire_common_defs.h"
+#include "acquire_config.h"
 
-#define LIBACQUIRE_IMPL_ACQUIRE_NET_COMMON 1
+#define LIBACQUIRE_ACQUIRE_NET_COMMON_IMPL 1
 
 #ifdef DOWNLOAD_DIR_IMPL
 const char *get_download_dir(void) { return ".downloads"; }
@@ -81,7 +81,7 @@ bool is_downloaded(const char *url, enum Checksum checksum, const char *hash,
 }
 
 #endif /* defined(LIBACQUIRE_IMPLEMENTATION) &&                                \
-          !defined(LIBACQUIRE_IMPL_ACQUIRE_NET_COMMON) */
+          !defined(LIBACQUIRE_ACQUIRE_NET_COMMON_IMPL) */
 
 #ifdef __cplusplus
 }
diff --git a/acquire/acquire_openssl.h b/acquire/acquire_openssl.h
@@ -228,25 +228,25 @@ int sha512_file(const char *filename,
   return exit_code;
 }
 
-#ifndef LIBACQUIRE_IMPL_SHA256
-#define LIBACQUIRE_IMPL_SHA256
+#ifndef LIBACQUIRE_SHA256_IMPL
+#define LIBACQUIRE_SHA256_IMPL
 bool sha256(const char *filename, const char *hash) {
   unsigned char sha_output[SHA256_DIGEST_LENGTH * 2 + 1];
   sha256_file(filename, sha_output);
 
   return strcmp((const char *)sha_output, hash) == 0;
 }
-#endif /* !LIBACQUIRE_IMPL_SHA256 */
+#endif /* !LIBACQUIRE_SHA256_IMPL */
 
-#ifndef LIBACQUIRE_IMPL_SHA512
-#define LIBACQUIRE_IMPL_SHA512
+#ifndef LIBACQUIRE_SHA512_IMPL
+#define LIBACQUIRE_SHA512_IMPL
 bool sha512(const char *filename, const char *hash) {
   unsigned char sha_output[SHA512_DIGEST_LENGTH * 2 + 1];
   sha512_file(filename, sha_output);
 
   return strcmp((const char *)sha_output, hash) == 0;
 }
-#endif /* !LIBACQUIRE_IMPL_SHA512 */
+#endif /* !LIBACQUIRE_SHA512_IMPL */
 
 #endif /* defined(LIBACQUIRE_IMPLEMENTATION) &&                                \
           defined(LIBACQUIRE_CRYPTO_IMPL) */
diff --git a/acquire/acquire_stdbool.h b/acquire/acquire_stdbool.h
@@ -1,4 +1,4 @@
-#if !defined(_STDBOOL_H) && !defined(HAS_STDBOOL)
+#if !defined(_STDBOOL_H) && !defined(HAS_STDBOOL) && !defined(__cplusplus)
 #define _STDBOOL_H
 
 /**
@@ -27,4 +27,5 @@ typedef size_t bool;
 #define true 1
 #define false (!true)
 
-#endif /* !defined(_STDBOOL_H) && !defined(HAS_STDBOOL) */
+#endif /* !defined(_STDBOOL_H) && !defined(HAS_STDBOOL) &&                     \
+          !defined(__cplusplus) */
diff --git a/acquire/acquire_string_extras.h b/acquire/acquire_string_extras.h
@@ -134,12 +134,13 @@ extern LIBACQUIRE_EXPORT size_t strerrorlen_s(errno_t);
 
 #if !defined(HAVE_SNPRINTF) && !defined(HAVE_SNPRINTF_H)
 extern LIBACQUIRE_EXPORT int snprintf(char *buffer, size_t count,
-                                              const char *format, ...);
+                                      const char *format, ...);
 #endif /* !defined(HAVE_SNPRINTF) && !defined(HAVE_SNPRINTF_H) */
 
 #ifdef LIBACQUIRE_IMPLEMENTATION
 
-#if !defined(HAVE_SNPRINTF) && !defined(SNPRINTF_IMPL) && !defined(HAVE_SNPRINTF_H)
+#if !defined(HAVE_SNPRINTF) && !defined(SNPRINTF_IMPL) &&                      \
+    !defined(HAVE_SNPRINTF_H)
 #define SNPRINTF_IMPL
 
 /*
@@ -182,7 +183,8 @@ inline double wtf_vsnprintf(char *buffer, size_t count, const char *format,
 #define vsnprintf(buffer, count, format, args)                                 \
   wtf_vsnprintf(buffer, count, format, args)
 
-#endif /* !defined(HAVE_SNPRINTF) && !defined(SNPRINTF_IMPL) && !defined(HAVE_SNPRINTF_H) */
+#endif /* !defined(HAVE_SNPRINTF) && !defined(SNPRINTF_IMPL) &&                \
+          !defined(HAVE_SNPRINTF_H) */
 
 #if !defined(HAVE_STRNCASECMP) && !defined(STRNCASECMP_IMPL)
 #define STRNCASECMP_IMPL
diff --git a/acquire/acquire_url_utils.h b/acquire/acquire_url_utils.h
@@ -5,8 +5,8 @@
 #ifndef LIBACQUIRE_ACQUIRE_URL_UTILS_H
 #define LIBACQUIRE_ACQUIRE_URL_UTILS_H
 
-#include "libacquire_export.h"
 #include "acquire_common_defs.h"
+#include "libacquire_export.h"
 #ifdef __cplusplus
 extern "C" {
 #elif defined(HAS_STDBOOL) && !defined(bool)
@@ -21,8 +21,8 @@ extern "C" {
 #include "acquire_string_extras.h"
 #endif /* defined(WIN32) || defined(_WIN32) || defined(__WIN32__) ||           \
           defined(__NT__) */
-#include <string.h>
 #include <acquire_common_defs.h>
+#include <string.h>
 #ifndef NAME_MAX
 #define NAME_MAX 4096
 #endif /* ! NAME_MAX */
@@ -56,7 +56,7 @@ extern LIBACQUIRE_EXPORT const char *get_path_from_url(const char *url);
 extern LIBACQUIRE_EXPORT bool is_url(const char *maybe_url);
 
 #if defined(LIBACQUIRE_IMPLEMENTATION) &&                                      \
-    defined(LIBACQUIRE_IMPL_ACQUIRE_FILEUTILS)
+    defined(LIBACQUIRE_ACQUIRE_URL_UTILS_IMPL)
 
 const char *get_path_from_url(const char *url) {
   static char buf[NAME_MAX + 1];
@@ -100,7 +100,7 @@ bool is_url(const char *maybe_url) {
 }
 
 #endif /* defined(LIBACQUIRE_IMPLEMENTATION) &&                                \
-          defined(LIBACQUIRE_IMPL_ACQUIRE_FILEUTILS) */
+          defined(LIBACQUIRE_ACQUIRE_URL_UTILS_IMPL) */
 
 #ifdef __cplusplus
 }
diff --git a/acquire/acquire_wincrypt.h b/acquire/acquire_wincrypt.h
@@ -124,22 +124,22 @@ BOOL sha256_file(LPCSTR filename,
 #undef MD5LEN
 }
 
-#ifndef LIBACQUIRE_IMPL_SHA256
-#define LIBACQUIRE_IMPL_SHA256
+#ifndef LIBACQUIRE_SHA256_IMPL
+#define LIBACQUIRE_SHA256_IMPL
 bool sha256(const char *filename, const char *hash) {
   CHAR result[SHA256_BLOCK_BYTES + 1];
   sha256_file(filename, result);
   return strcmp(hash, result) == 0;
 }
-#endif /* !LIBACQUIRE_IMPL_SHA256 */
+#endif /* !LIBACQUIRE_SHA256_IMPL */
 
-#ifndef LIBACQUIRE_IMPL_SHA512
-#define LIBACQUIRE_IMPL_SHA512
+#ifndef LIBACQUIRE_SHA512_IMPL
+#define LIBACQUIRE_SHA512_IMPL
 bool sha512(const char *filename, const char *hash) {
   fputs("SHA512 for wincrypt not implemented: always returns `false`", stderr);
   return false;
 }
-#endif /* !LIBACQUIRE_IMPL_SHA512 */
+#endif /* !LIBACQUIRE_SHA512_IMPL */
 
 #ifdef __cplusplus
 }
diff --git a/acquire/tests/test.c b/acquire/tests/test.c
@@ -1,7 +1,3 @@
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS 1
-#endif /* _MSC_VER */
-
 #include <greatest.h>
 
 #include "test_checksum.h"
diff --git a/acquire/tests/test_amalgamation.c b/acquire/tests/test_amalgamation.c
@@ -1,7 +1,3 @@
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS 1
-#endif /* _MSC_VER */
-
 #include <greatest.h>
 
 #include "test_amalgamation.h"
diff --git a/acquire/tests/test_amalgamation.h b/acquire/tests/test_amalgamation.h
@@ -2,7 +2,13 @@
 #define TEST_AMALGAMATION_H
 
 #include <greatest.h>
+#ifdef __cplusplus
+extern "C" {
+#elif defined(HAS_STDBOOL) && !defined(bool)
 #include <stdbool.h>
+#else
+#include "acquire_stdbool.h"
+#endif /* __cplusplus */
 
 #include <acquire.h>
 #include <acquire_config.h>
diff --git a/acquire/tests/test_checksum.h b/acquire/tests/test_checksum.h
@@ -1,7 +1,13 @@
 #ifndef TEST_CHECKSUM_H
 #define TEST_CHECKSUM_H
 
+#ifdef __cplusplus
+extern "C" {
+#elif defined(HAS_STDBOOL) && !defined(bool)
 #include <stdbool.h>
+#else
+#include "acquire_stdbool.h"
+#endif /* __cplusplus */
 
 #include <greatest.h>
 
diff --git a/acquire/tests/test_extract.c b/acquire/tests/test_extract.c
@@ -1,7 +1,3 @@
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS 1
-#endif /* _MSC_VER */
-
 #include <greatest.h>
 
 #include "test_extract.h"
diff --git a/acquire/tests/test_extract.h b/acquire/tests/test_extract.h
@@ -2,7 +2,13 @@
 #define LIBACQUIRE_TEST_EXTRACT_H
 
 #include <greatest.h>
+#ifdef __cplusplus
+extern "C" {
+#elif defined(HAS_STDBOOL) && !defined(bool)
 #include <stdbool.h>
+#else
+#include "acquire_stdbool.h"
+#endif /* __cplusplus */
 
 #define TO_STRING(x) #x
 #define STR(x) TO_STRING(x)
diff --git a/acquire/tests/test_url_utils.h b/acquire/tests/test_url_utils.h
@@ -2,7 +2,14 @@
 #define TEST_ACQUIRE_URL_UTILS_H
 
 #include <greatest.h>
+#ifdef __cplusplus
+extern "C" {
+#elif defined(HAS_STDBOOL) && !defined(bool)
 #include <stdbool.h>
+#else
+#include "acquire_stdbool.h"
+#include "libacquire_export.h"
+#endif /* __cplusplus */
 
 #include <acquire.h>
 #include <acquire_config.h>
diff --git a/alpine.Dockerfile b/alpine.Dockerfile
@@ -1,7 +1,6 @@
 FROM alpine
 
 RUN apk add --no-cache \
-    bsd-compat-headers \
     cmake \
     curl-dev \
     gcc \
