diff options
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | libca-certificates-curl/libca-certificates-curl/export.h | 20 | ||||
| -rw-r--r-- | libca-certificates-curl/libca-certificates-curl/version.h.in | 38 |
3 files changed, 29 insertions, 31 deletions
@@ -1,7 +1,5 @@ On the revision: -- Replace the C++ comments with C comments in version.h.in and export.h. - On the release: - Use legal{} target type for legal documentation (LICENSE, AUTHORS, etc). diff --git a/libca-certificates-curl/libca-certificates-curl/export.h b/libca-certificates-curl/libca-certificates-curl/export.h index 8ea6cae..cb410a2 100644 --- a/libca-certificates-curl/libca-certificates-curl/export.h +++ b/libca-certificates-curl/libca-certificates-curl/export.h @@ -4,27 +4,27 @@ #pragma once -#if defined(LIBCA_CERTIFICATES_CURL_STATIC) // Using static. +#if defined(LIBCA_CERTIFICATES_CURL_STATIC) /* Using static. */ # define LIBCA_CERTIFICATES_CURL_SYMEXPORT -#elif defined(LIBCA_CERTIFICATES_CURL_STATIC_BUILD) // Building static. +#elif defined(LIBCA_CERTIFICATES_CURL_STATIC_BUILD) /* Building static. */ # define LIBCA_CERTIFICATES_CURL_SYMEXPORT -#elif defined(LIBCA_CERTIFICATES_CURL_SHARED) // Using shared. +#elif defined(LIBCA_CERTIFICATES_CURL_SHARED) /* Using shared. */ # ifdef _WIN32 # define LIBCA_CERTIFICATES_CURL_SYMEXPORT __declspec(dllimport) # else # define LIBCA_CERTIFICATES_CURL_SYMEXPORT # endif -#elif defined(LIBCA_CERTIFICATES_CURL_SHARED_BUILD) // Building shared. +#elif defined(LIBCA_CERTIFICATES_CURL_SHARED_BUILD) /* Building shared. */ # ifdef _WIN32 # define LIBCA_CERTIFICATES_CURL_SYMEXPORT __declspec(dllexport) # else # define LIBCA_CERTIFICATES_CURL_SYMEXPORT # endif #else -// If none of the above macros are defined, then we assume we are being used -// by some third-party build system that cannot/doesn't signal the library -// type. Note that this fallback works for both static and shared but in case -// of shared will be sub-optimal compared to having dllimport. -// -# define LIBCA_CERTIFICATES_CURL_SYMEXPORT // Using static or shared. +/* If none of the above macros are defined, then we assume we are being used + * by some third-party build system that cannot/doesn't signal the library + * type. Note that this fallback works for both static and shared but in case + * of shared will be sub-optimal compared to having dllimport. + */ +# define LIBCA_CERTIFICATES_CURL_SYMEXPORT /* Using static or shared. */ #endif diff --git a/libca-certificates-curl/libca-certificates-curl/version.h.in b/libca-certificates-curl/libca-certificates-curl/version.h.in index 5c92d7c..6e02dec 100644 --- a/libca-certificates-curl/libca-certificates-curl/version.h.in +++ b/libca-certificates-curl/libca-certificates-curl/version.h.in @@ -4,25 +4,25 @@ #pragma once -// The numeric version format is AAAAABBBBBCCCCCDDDE where: -// -// AAAAA - major version number -// BBBBB - minor version number -// CCCCC - bugfix version number -// DDD - alpha / beta (DDD + 500) version number -// E - final (0) / snapshot (1) -// -// When DDDE is not 0, 1 is subtracted from AAAAABBBBBCCCCC. For example: -// -// Version AAAAABBBBBCCCCCDDDE -// -// 0.1.0 0000000001000000000 -// 0.1.2 0000000001000020000 -// 1.2.3 0000100002000030000 -// 2.2.0-a.1 0000200001999990010 -// 3.0.0-b.2 0000299999999995020 -// 2.2.0-a.1.z 0000200001999990011 -// +/* The numeric version format is AAAAABBBBBCCCCCDDDE where: + * + * AAAAA - major version number + * BBBBB - minor version number + * CCCCC - bugfix version number + * DDD - alpha / beta (DDD + 500) version number + * E - final (0) / snapshot (1) + * + * When DDDE is not 0, 1 is subtracted from AAAAABBBBBCCCCC. For example: + * + * Version AAAAABBBBBCCCCCDDDE + * + * 0.1.0 0000000001000000000 + * 0.1.2 0000000001000020000 + * 1.2.3 0000100002000030000 + * 2.2.0-a.1 0000200001999990010 + * 3.0.0-b.2 0000299999999995020 + * 2.2.0-a.1.z 0000200001999990011 + */ #define LIBCA_CERTIFICATES_CURL_VERSION $libca_certificates_curl.version.project_number$ULL #define LIBCA_CERTIFICATES_CURL_VERSION_STR "$libca_certificates_curl.version.project$" #define LIBCA_CERTIFICATES_CURL_VERSION_ID "$libca_certificates_curl.version.project_id$" |