[*.h] More careful header guards for MSVC ; [acquire/libacquire_export.h] Attempts to manually create export header to get "inconsistent dll linkage" error resolved

SamuelMarks · SamuelMarks · commit 10c5b12cb4a7 · 2025-06-10T23:46:42.000-06:00
diff --git a/acquire/CMakeLists.txt b/acquire/CMakeLists.txt
@@ -350,7 +350,9 @@ target_compile_definitions("${LIBRARY_NAME}" "${lib_vis}" "_${TARGET_ARCH}_")
 include(GenerateExportHeader)
 set(_export_file "${CMAKE_CURRENT_BINARY_DIR}/lib${LIBRARY_NAME}_export.h")
 
-if (LIBACQUIRE_HEADER_ONLY)
+if (1)
+   # pass
+elseif (LIBACQUIRE_HEADER_ONLY)
     file(WRITE "${_export_file}"
             "#ifndef LIBACQUIRE_EXPORT_H\n"
             "#define LIBACQUIRE_EXPORT_H\n\n"
@@ -404,5 +406,5 @@ install(TARGETS ${installable_libs}
         LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
 install(FILES "${PROJECT_BINARY_DIR}/src/acquire_config.h"
-        ${Header_Files} ${_Header_Files} ${_export_file}
+        ${Header_Files} ${_Header_Files} # ${_export_file}
         TYPE "INCLUDE")
diff --git a/acquire/acquire_download.h b/acquire/acquire_download.h
@@ -28,11 +28,11 @@ extern "C" {
 #include "acquire_checksums.h"
 #include "libacquire_export.h"
 
-#if defined(USE_COMMON_CRYPTO) || defined(USE_OPENSSL)
+#if (defined(USE_COMMON_CRYPTO) && USE_COMMON_CRYPTO==1) || (defined(USE_OPENSSL) && USE_OPENSSL==1)
 #include "acquire_openssl.h"
-#elif defined(USE_WINCRYPT)
+#elif defined(USE_WINCRYPT) && USE_WINCRYPT==1
 #include "acquire_wincrypt.h"
-#endif /* defined(USE_COMMON_CRYPTO) || defined(USE_OPENSSL) */
+#endif /* (defined(USE_COMMON_CRYPTO) && USE_COMMON_CRYPTO==1) || (defined(USE_OPENSSL) && USE_OPENSSL==1) */
 
 extern LIBACQUIRE_EXPORT const char *get_download_dir(void);
 
diff --git a/acquire/acquire_libarchive.h b/acquire/acquire_libarchive.h
@@ -1,5 +1,5 @@
-#if !defined(LIBACQUIRE_ACQUIRE_LIBARCHIVE_H) && defined(USE_LIBARCHIVE) &&    \
-    defined(LIBACQUIRE_IMPLEMENTATION) && !defined(LIBACQUIRE_EXTRACT_IMPL)
+#if !defined(LIBACQUIRE_ACQUIRE_LIBARCHIVE_H) && defined(USE_LIBARCHIVE) && \
+    USE_LIBARCHIVE==1 && defined(LIBACQUIRE_IMPLEMENTATION) && !defined(LIBACQUIRE_EXTRACT_IMPL)
 #define LIBACQUIRE_ACQUIRE_LIBARCHIVE_H
 #define LIBACQUIRE_EXTRACT_IMPL
 
@@ -111,6 +111,5 @@ int extract_archive(enum Archive archive, const char *archive_filepath,
 }
 #endif /* __cplusplus */
 
-#endif /* !defined(LIBACQUIRE_ACQUIRE_LIBARCHIVE_H) && defined(USE_LIBARCHIVE) \
-          && defined(LIBACQUIRE_IMPLEMENTATION) &&                             \
-          !defined(LIBACQUIRE_EXTRACT_IMPL) */
+#endif /* !defined(LIBACQUIRE_ACQUIRE_LIBARCHIVE_H) && defined(USE_LIBARCHIVE) &&    \
+          USE_LIBARCHIVE==1 && defined(LIBACQUIRE_IMPLEMENTATION) && !defined(LIBACQUIRE_EXTRACT_IMPL) */
diff --git a/acquire/acquire_libcurl.h b/acquire/acquire_libcurl.h
@@ -1,7 +1,7 @@
 #ifndef LIBACQUIRE_LIBCURL_H
 #define LIBACQUIRE_LIBCURL_H
 
-#if defined(USE_LIBCURL) && defined(LIBACQUIRE_IMPLEMENTATION)
+#if defined(USE_LIBCURL) && USE_LIBCURL==1 && defined(LIBACQUIRE_IMPLEMENTATION)
 
 /*
  * libcurl implementation of libacquire's download API
diff --git a/acquire/acquire_libfetch.h b/acquire/acquire_libfetch.h
@@ -74,11 +74,11 @@ __FBSDID("$FreeBSD$");
 #include <termios.h>
 #include <unistd.h>
 
-#ifdef USE_MY_LIBFETCH
+#if defined(USE_MY_LIBFETCH) && USE_MY_LIBFETCH==1
 #include "freebsd_libfetch/fetch.h"
 #else
 #include <fetch.h>
-#endif /* USE_MY_LIBFETCH */
+#endif /* defined(USE_MY_LIBFETCH) && USE_MY_LIBFETCH==1 */
 
 #define TIMEOUT 120
 
diff --git a/acquire/acquire_librhash.h b/acquire/acquire_librhash.h
@@ -5,7 +5,7 @@
 #ifndef LIBACQUIRE_ACQUIRE_LIBRHASH_H
 #define LIBACQUIRE_ACQUIRE_LIBRHASH_H
 
-#if defined(LIBACQUIRE_IMPLEMENTATION) && defined(USE_LIBRHASH)
+#if defined(LIBACQUIRE_IMPLEMENTATION) && defined(USE_LIBRHASH) && USE_LIBRHASH==1
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/acquire/acquire_miniz.h b/acquire/acquire_miniz.h
@@ -1,4 +1,4 @@
-#if !defined(LIBACQUIRE_ACQUIRE_MINIZ_H) && defined(USE_MINIZ) &&              \
+#if !defined(LIBACQUIRE_ACQUIRE_MINIZ_H) && defined(USE_MINIZ) && USE_MINIZ==1 \
     defined(LIBACQUIRE_IMPLEMENTATION) && !defined(LIBACQUIRE_EXTRACT_IMPL)
 #define LIBACQUIRE_ACQUIRE_MINIZ_H
 #define LIBACQUIRE_EXTRACT_IMPL
@@ -41,6 +41,5 @@ int extract_archive(enum Archive archive, const char *archive_filepath,
 }
 #endif /* __cplusplus */
 
-#endif /* !defined(LIBACQUIRE_ACQUIRE_MINIZ_H) && defined(USE_MINIZ) &&        \
-          defined(LIBACQUIRE_IMPLEMENTATION)  &&                               \
-          !defined(LIBACQUIRE_EXTRACT_IMPL) */
+#endif /* !defined(LIBACQUIRE_ACQUIRE_MINIZ_H) && defined(USE_MINIZ) && USE_MINIZ==1 \
+          defined(LIBACQUIRE_IMPLEMENTATION) && !defined(LIBACQUIRE_EXTRACT_IMPL) */
diff --git a/acquire/acquire_openssl.h b/acquire/acquire_openssl.h
@@ -17,7 +17,7 @@ extern "C" {
 
 #include "acquire_config.h"
 
-#if defined(USE_COMMON_CRYPTO) || defined(USE_OPENSSL)
+#if (defined(USE_COMMON_CRYPTO) && USE_COMMON_CRYPTO==1) || (defined(USE_OPENSSL) && USE_OPENSSL==1)
 
 #include "acquire_checksums.h"
 
@@ -37,7 +37,7 @@ extern "C" {
 #define SHA512_Final CC_SHA512_Final
 #define SHA512_BLOCK_BYTES CC_SHA512_BLOCK_BYTES
 
-#elif defined(USE_OPENSSL)
+#elif defined(USE_OPENSSL) && USE_OPENSSL==1
 
 #include <openssl/macros.h>
 #include <openssl/sha.h>
@@ -50,7 +50,7 @@ extern "C" {
 #define SHA256_BLOCK_BYTES 64 /* block size in bytes */
 #define SHA512_BLOCK_BYTES (SHA256_BLOCK_BYTES * 2)
 
-#endif /* USE_COMMON_CRYPTO */
+#endif /* (defined(USE_COMMON_CRYPTO) && USE_COMMON_CRYPTO==1) || (defined(USE_OPENSSL) && USE_OPENSSL==1) */
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/acquire/acquire_wincrypt.h b/acquire/acquire_wincrypt.h
@@ -4,7 +4,7 @@
  * This should also work on Windows, ReactOS, and derivatives.
  * */
 
-#if !defined(LIBACQUIRE_WINCRYPT_H) && defined(USE_WINCRYPT) &&                \
+#if !defined(LIBACQUIRE_WINCRYPT_H) && defined(USE_WINCRYPT) && USE_WINCRYPT==1 \
     defined(LIBACQUIRE_IMPLEMENTATION) && defined(LIBACQUIRE_CRYPTO_IMPL)
 #define LIBACQUIRE_WINCRYPT_H
 
@@ -145,6 +145,5 @@ bool sha512(const char *filename, const char *hash) {
 }
 #endif /* __cplusplus */
 
-#endif /* !defined(LIBACQUIRE_WINCRYPT_H) && defined(USE_WINCRYPT) &&          \
-          defined(LIBACQUIRE_IMPLEMENTATION) &&                                \
-          defined(LIBACQUIRE_CRYPTO_IMPL) */
+#endif /* !defined(LIBACQUIRE_WINCRYPT_H) && defined(USE_WINCRYPT) && USE_WINCRYPT==1 \
+          defined(LIBACQUIRE_IMPLEMENTATION) && defined(LIBACQUIRE_CRYPTO_IMPL) */
diff --git a/acquire/acquire_wininet.h b/acquire/acquire_wininet.h
@@ -5,7 +5,7 @@
  * */
 
 #if !defined(LIBACQUIRE_WININET_H) && defined(USE_WININET) &&                  \
-    defined(LIBACQUIRE_IMPLEMENTATION)
+    USE_WININET==1 && defined(LIBACQUIRE_IMPLEMENTATION)
 #define LIBACQUIRE_WININET_H
 
 #ifdef __cplusplus
@@ -134,5 +134,5 @@ int download(const char *url, enum Checksum checksum, const char *hash,
 }
 #endif /* __cplusplus */
 
-#endif /* !defined(LIBACQUIRE_WININET_H) && defined(USE_WININET) &&            \
-          defined(LIBACQUIRE_IMPLEMENTATION) */
+#endif /* !defined(LIBACQUIRE_WININET_H) && defined(USE_WININET) &&                  \
+          USE_WININET==1 && defined(LIBACQUIRE_IMPLEMENTATION) */
diff --git a/acquire/acquire_winseccng.h b/acquire/acquire_winseccng.h
@@ -6,7 +6,7 @@
  * Very much a WiP
  * */
 
-#ifndef !defined(LIBACQUIRE_WINSECCNG_H) && defined(USE_WINSECCNG) &&          \
+#if !defined(LIBACQUIRE_WINSECCNG_H) && defined(USE_WINSECCNG) && USE_WINSECCNG==1         \
     defined(LIBACQUIRE_IMPLEMENTATION) && defined(LIBACQUIRE_CRYPTO_IMPL)
 #define LIBACQUIRE_WINSECCNG_H
 
@@ -118,6 +118,5 @@ void __cdecl wmain(int argc, __in_ecount(argc) LPWSTR *wargv) {
 }
 #endif /* __cplusplus */
 
-#endif /* !defined(LIBACQUIRE_WINSECCNG_H) && defined(USE_WINSECCNG) &&        \
-          defined(LIBACQUIRE_IMPLEMENTATION) &&                                \
-          defined(LIBACQUIRE_CRYPTO_IMPL) */
+#endif /* !defined(LIBACQUIRE_WINSECCNG_H) && defined(USE_WINSECCNG) && USE_WINSECCNG==1 \
+          defined(LIBACQUIRE_IMPLEMENTATION) && defined(LIBACQUIRE_CRYPTO_IMPL) */
diff --git a/acquire/acquire_zlib.h b/acquire/acquire_zlib.h
@@ -3,7 +3,7 @@
  * https://nachtimwald.com/2019/09/08/making-minizip-easier-to-use
  */
 
-#if !defined(LIBACQUIRE_ACQUIRE_ZLIB_H) && defined(USE_ZLIB) &&                \
+#if !defined(LIBACQUIRE_ACQUIRE_ZLIB_H) && defined(USE_ZLIB) && USE_ZLIB==1 \
     defined(LIBACQUIRE_IMPLEMENTATION)
 #define LIBACQUIRE_ACQUIRE_ZLIB_H
 
@@ -127,5 +127,5 @@ int extract_archive(enum Archive archive, const char *archive_filepath,
 }
 #endif /* __cplusplus */
 
-#endif /* !defined(LIBACQUIRE_ACQUIRE_ZLIB_H) && defined(USE_ZLIB) &&          \
+#endif /* !defined(LIBACQUIRE_ACQUIRE_ZLIB_H) && defined(USE_ZLIB) && USE_ZLIB==1 \
           defined(LIBACQUIRE_IMPLEMENTATION) */
diff --git a/acquire/cli/cli.c b/acquire/cli/cli.c
@@ -327,7 +327,7 @@ int docopt(struct DocoptArgs *args, int argc, char *argv[], const bool help,
   args->hash = NULL;
   args->output = NULL;
   args->usage_pattern = usage_pattern;
-  memcpy(args->help_message, help_message, sizeof help_message);
+  memcpy((char*)args->help_message, (char*)help_message, sizeof help_message);
 
   elements.n_commands = 0;
   elements.n_arguments = 1;
diff --git a/acquire/cli/main.c b/acquire/cli/main.c
@@ -12,44 +12,43 @@
 
 #include "cli.h"
 
-#ifdef USE_CRC32C
+#if defined(USE_CRC32C) && USE_CRC32C==1
 #include <acquire_crc32c.h>
-#elif defined(USE_LIBRHASH)
+#elif defined(USE_LIBRHASH) && USE_LIBRHASH==1
 #include <acquire_librhash.h>
-#endif /* USE_CRC32C */
+#endif /* defined(USE_CRC32C) && USE_CRC32C==1 */
 
-#ifdef USE_LIBCURL
+#if defined(USE_LIBCURL) && USE_LIBCURL==1
 
 #include <acquire_libcurl.h>
 
-#elif defined(USE_WININET)
+#elif defined(USE_WININET) && USE_WININET==1
 
 #include <acquire_wininet.h>
 
-#elif defined(USE_LIBFETCH)
+#elif defined(USE_LIBFETCH) && USE_LIBFETCH==1
 
 #include <acquire_libfetch.h>
 
-#elif defined(USE_OPENBSD_FTP)
+#elif defined(USE_OPENBSD_FTP) && USE_OPENBSD_FTP==1
 
 #include <acquire_openbsd_ftp.h>
 
-#endif /* USE_LIBCURL */
+#endif /* defined(USE_LIBCURL) && USE_LIBCURL==1 */
 
-#if defined(USE_OPENSSL) || defined(USE_LIBRESSL) || defined(USE_COMMON_CRYPTO)
+#if (defined(USE_OPENSSL) && USE_OPENSSL==1) || (defined(USE_LIBRESSL) && USE_LIBRESSL==1) || (defined(USE_COMMON_CRYPTO) && USE_COMMON_CRYPTO==1)
 #include <acquire_openssl.h>
-#elif defined(USE_WINCRYPT)
+#elif defined(USE_WINCRYPT) && USE_WINCRYPT==1
 #include <acquire_wincrypt.h>
-#endif /* defined(USE_OPENSSL) || defined(USE_LIBRESSL) ||                     \
-          defined(USE_COMMON_CRYPTO) */
+#endif /* (defined(USE_OPENSSL) && USE_OPENSSL==1) || (defined(USE_LIBRESSL) && USE_LIBRESSL==1) || (defined(USE_COMMON_CRYPTO) && USE_COMMON_CRYPTO==1) */
 
-#ifdef USE_MINIZ
+#if defined(USE_MINIZ) && USE_MINIZ == 1
 #include <acquire_miniz.h>
-#elif defined(USE_LIBARCHIVE)
+#elif defined(USE_LIBARCHIVE) && USE_LIBARCHIVE == 1
 #include <acquire_libarchive.h>
 #elif
 #error "Extract library must be specified"
-#endif /* USE_MINIZ */
+#endif /* defined(USE_MINIZ) && USE_MINIZ == 1 */
 
 int main(int argc, char *argv[]) {
   int rc = EXIT_SUCCESS;
diff --git a/acquire/libacquire_export.h b/acquire/libacquire_export.h
@@ -0,0 +1,84 @@
+#ifndef LIBACQUIRE_EXPORT_H
+#define LIBACQUIRE_EXPORT_H
+
+#ifdef LIBACQUIRE_STATIC_DEFINE
+#define LIBACQUIRE_EXPORT
+#define LIBACQUIRE_NO_EXPORT
+#else
+#ifndef LIBACQUIRE_EXPORT
+#ifdef LIBACQUIRE_EXPORTS
+/* We are building this library */
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MSYS__) ||          \
+    defined(__CYGWIN__)
+
+#ifdef LIBACQUIRE_IMPLEMENTATION
+# define LIBACQUIRE_EXPORT __declspec(dllexport)
+#else
+# define LIBACQUIRE_EXPORT __declspec(dllimport)
+#endif
+
+
+#elif defined(__SUNPRO_C)
+#define LIBACQUIRE_EXPORT __global
+#else
+#define LIBACQUIRE_EXPORT __attribute__((visibility("default")))
+#endif /* defined(_MSC_VER) || defined(__MINGW32__) || defined(__MSYS__) ||    \
+          defined(__CYGWIN__) */
+#else
+/* We are using this library */
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MSYS__) ||          \
+    defined(__CYGWIN__)
+
+#ifdef LIBACQUIRE_IMPLEMENTATION
+# define LIBACQUIRE_EXPORT __declspec(dllexport)
+#else
+# define LIBACQUIRE_EXPORT __declspec(dllimport)
+#endif
+
+#elif defined(__SUNPRO_C)
+#define LIBACQUIRE_EXPORT __global
+#else
+#define LIBACQUIRE_EXPORT __attribute__((visibility("default")))
+#endif /* defined(_MSC_VER) || defined(__MINGW32__) || defined(__MSYS__) ||    \
+          defined(__CYGWIN__) */
+#endif /* LIBACQUIRE_EXPORTS */
+#endif /* ! LIBACQUIRE_EXPORT */
+
+#ifndef LIBACQUIRE_NO_EXPORT
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MSYS__) ||          \
+    defined(__CYGWIN__) || defined(__SUNPRO_C)
+#define LIBACQUIRE_NO_EXPORT
+#else
+#define LIBACQUIRE_NO_EXPORT __attribute__((visibility("hidden")))
+#endif /* defined(_MSC_VER) || defined(__MINGW32__) || defined(__MSYS__) ||    \
+          defined(__CYGWIN__) || defined(__SUNPRO_C) */
+#endif /* ! LIBACQUIRE_NO_EXPORT */
+#endif /* LIBACQUIRE_STATIC_DEFINE */
+
+#ifndef LIBACQUIRE_DEPRECATED
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MSYS__) ||          \
+    defined(__CYGWIN__)
+#define LIBACQUIRE_DEPRECATED __declspec(deprecated)
+#elif defined(__SUNPRO_C)
+#define LIBACQUIRE_DEPRECATED
+#else
+#define LIBACQUIRE_DEPRECATED __attribute__((__deprecated__))
+#endif /* defined(_MSC_VER) || defined(__MINGW32__) || defined(__MSYS__) ||    \
+          defined(__CYGWIN__) */
+#endif /* ! LIBACQUIRE_DEPRECATED */
+
+#ifndef LIBACQUIRE_DEPRECATED_EXPORT
+#define LIBACQUIRE_DEPRECATED_EXPORT LIBACQUIRE_EXPORT LIBACQUIRE_DEPRECATED
+#endif /* ! LIBACQUIRE_DEPRECATED_EXPORT */
+
+#ifndef LIBACQUIRE_DEPRECATED_NO_EXPORT
+#define LIBACQUIRE_DEPRECATED_NO_EXPORT LIBACQUIRE_NO_EXPORT LIBACQUIRE_DEPRECATED
+#endif /* ! LIBACQUIRE_DEPRECATED_NO_EXPORT */
+
+#if 0 /* DEFINE_NO_DEPRECATED */
+#ifndef LIBACQUIRE_NO_DEPRECATED
+#define LIBACQUIRE_NO_DEPRECATED
+#endif /* ! LIBACQUIRE_NO_DEPRECATED */
+#endif /* 0 */
+
+#endif /* !LIBACQUIRE_EXPORT_H */
diff --git a/acquire/tests/test_checksum.h b/acquire/tests/test_checksum.h
@@ -15,15 +15,15 @@ extern "C" {
 #include <acquire_config.h>
 #include <config_for_tests.h>
 
-#ifdef USE_CRC32C
+#if defined(USE_CRC32C) && USE_CRC32C==1
 #include <acquire_crc32c.h>
-#elif defined(USE_LIBRHASH)
+#elif defined(USE_LIBRHASH) && USE_LIBRHASH==1
 #include <acquire_librhash.h>
 #endif
 
-#if defined(USE_COMMON_CRYPTO) || defined(USE_OPENSSL)
+#if (defined(USE_COMMON_CRYPTO) && USE_COMMON_CRYPTO==1) || (defined(USE_OPENSSL) && USE_OPENSSL==1)
 #include <acquire_openssl.h>
-#elif defined(USE_WINCRYPT)
+#elif defined(USE_WINCRYPT) && USE_WINCRYPT==1
 #include <acquire_wincrypt.h>
 #endif
 
diff --git a/acquire/tests/test_download.h b/acquire/tests/test_download.h
@@ -7,19 +7,19 @@
 #include <acquire_config.h>
 #include <config_for_tests.h>
 
-#if defined(USE_COMMON_CRYPTO) || defined(USE_OPENSSL)
+#if (defined(USE_COMMON_CRYPTO) && USE_COMMON_CRYPTO==1) || (defined(USE_OPENSSL) && USE_OPENSSL==1)
 #include <acquire_openssl.h>
-#elif defined(USE_WINCRYPT)
+#elif defined(USE_WINCRYPT) && USE_WINCRYPT==1
 #include <acquire_wincrypt.h>
-#endif /* defined(USE_COMMON_CRYPTO) || defined(USE_OPENSSL) */
+#endif /* (defined(USE_COMMON_CRYPTO) && USE_COMMON_CRYPTO==1) || (defined(USE_OPENSSL) && USE_OPENSSL==1) */
 
 #include <acquire_download.h>
 
-#ifdef USE_LIBCURL
+#if defined(USE_LIBCURL) && USE_LIBCURL==1
 #include <acquire_libcurl.h>
-#elif defined(USE_WININET)
+#elif defined(USE_WININET) && USE_WININET==1
 #include <acquire_wininet.h>
-#elif defined(USE_LIBFETCH)
+#elif defined(USE_LIBFETCH) && USE_LIBFETCH==1
 #include <acquire_libfetch.h>
 #else
 #error "No networking library named"
diff --git a/acquire/tests/test_extract.h b/acquire/tests/test_extract.h
