cpp/charls
1
0
Fork 0
mirror of https://github.com/team-charls/charls synced 2025-03-28 21:03:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure version functions are exported as extern "C" functions

Browse Source 
Commit a869f6193b208b0cabdebe29ba655802ebf8bcde moved the version function to version.h, the extern "C" wrapping was not copied.
This commit is contained in:
Victor Derks 2021-01-10 15:36:48 +01:00
parent d0ee70ed4d
commit a11fe68bae
No known key found for this signature in database
GPG Key ID: 3CAD1C98620F0A27
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/charls/version.h
View File

@ -8,6 +8,7 @@
#ifdef __cplusplus
#include <cstdint>
extern "C" {
#else
#include <stdint.h>
#endif
@ -20,7 +21,7 @@
/// <summary>
/// Returns the version of CharLS in the semver format "major.minor.patch" or "major.minor.patch-pre_release"
/// </summary>
CHARLS_API_IMPORT_EXPORT const char* CHARLS_API_CALLING_CONVENTION charls_get_version_string(CHARLS_C_VOID) CHARLS_NOEXCEPT;
CHARLS_API_IMPORT_EXPORT const char* CHARLS_API_CALLING_CONVENTION charls_get_version_string(CHARLS_C_VOID);
/// <summary>
/// Returns the version of CharLS in its numerical format.
@ -29,4 +30,8 @@ CHARLS_API_IMPORT_EXPORT const char* CHARLS_API_CALLING_CONVENTION charls_get_ve
/// <param name="minor">Reference to the minor number, may be NULL/nullptr when this info is not needed.</param>
/// <param name="patch">Reference to the patch number, may be NULL/nullptr when this info is not needed.</param>
CHARLS_API_IMPORT_EXPORT void CHARLS_API_CALLING_CONVENTION
charls_get_version_number(OUT_OPT_ int32_t* major, OUT_OPT_ int32_t* minor, OUT_OPT_ int32_t* patch) CHARLS_NOEXCEPT;
charls_get_version_number(OUT_OPT_ int32_t* major, OUT_OPT_ int32_t* minor, OUT_OPT_ int32_t* patch);
#ifdef __cplusplus
}
#endif

7
src/version.cpp
View File

@ -10,13 +10,15 @@
// Turn A into a string literal after macro-expanding it.
#define TO_STRING(A) TO_STRING_NX(A) // NOLINT(cppcoreguidelines-macro-usage)
const char* CHARLS_API_CALLING_CONVENTION charls_get_version_string() noexcept
extern "C" {
const char* CHARLS_API_CALLING_CONVENTION charls_get_version_string()
{
return TO_STRING(CHARLS_VERSION_MAJOR) "." TO_STRING(CHARLS_VERSION_MINOR) "." TO_STRING(CHARLS_VERSION_PATCH);
}
void CHARLS_API_CALLING_CONVENTION charls_get_version_number(OUT_OPT_ int32_t* major, OUT_OPT_ int32_t* minor,
OUT_OPT_ int32_t* patch) noexcept
OUT_OPT_ int32_t* patch)
{
if (major)
{
@ -33,3 +35,4 @@ void CHARLS_API_CALLING_CONVENTION charls_get_version_number(OUT_OPT_ int32_t* m
*patch = CHARLS_VERSION_PATCH;
}
}
}