diff options
| author | Ladislav Zezula <zezula@volny.cz> | 2021-05-15 19:56:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-15 19:56:19 +0200 |
| commit | a7ebfbccb7eb16f4852a7fd3bd6a738ecb7db423 (patch) | |
| tree | 19266c6af697656321e84eb3ac28adc5829eb68a /src/libtomcrypt | |
| parent | 1e9f1cb3218b3ce8cca7683966234bc19647ef6d (diff) | |
| parent | 05d3a57b8a1ac88e22657290396a9b334a2bee1a (diff) | |
Merge pull request #223 from ladislav-zezula/CLANG_12_MAC
Clang 12 mac
Diffstat (limited to 'src/libtomcrypt')
| -rw-r--r-- | src/libtomcrypt/src/headers/tomcrypt_cfg.h | 12 | ||||
| -rw-r--r-- | src/libtomcrypt/src/headers/tomcrypt_custom.h | 8 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/libtomcrypt/src/headers/tomcrypt_cfg.h b/src/libtomcrypt/src/headers/tomcrypt_cfg.h index e266a49..335d55f 100644 --- a/src/libtomcrypt/src/headers/tomcrypt_cfg.h +++ b/src/libtomcrypt/src/headers/tomcrypt_cfg.h @@ -30,17 +30,25 @@ LTC_EXPORT void LTC_CALL XFREE(void *p); LTC_EXPORT void LTC_CALL XQSORT(void *base, size_t nmemb, size_t size, int(LTC_CALL * compar)(const void *, const void *)); - /* change the clock function too */ LTC_EXPORT clock_t LTC_CALL XCLOCK(void); +#endif // LTC_NO_PROTOTYPES /* various other functions */ +#ifndef LTC_NO_PROTOTYPES_MEMCPY LTC_EXPORT void * LTC_CALL XMEMCPY(void *dest, const void *src, size_t n); +#endif + +#ifndef LTC_NO_PROTOTYPES_MEMCMP LTC_EXPORT int LTC_CALL XMEMCMP(const void *s1, const void *s2, size_t n); +#endif + +#ifndef LTC_NO_PROTOTYPES_MEMSET LTC_EXPORT void * LTC_CALL XMEMSET(void *s, int c, size_t n); +#endif +#ifndef LTC_NO_PROTOTYPES_STRCMP LTC_EXPORT int LTC_CALL XSTRCMP(const char *s1, const char *s2); - #endif /* type of argument checking, 0=default, 1=fatal and 2=error+continue, 3=nothing */ diff --git a/src/libtomcrypt/src/headers/tomcrypt_custom.h b/src/libtomcrypt/src/headers/tomcrypt_custom.h index 88ec8f9..312a4c2 100644 --- a/src/libtomcrypt/src/headers/tomcrypt_custom.h +++ b/src/libtomcrypt/src/headers/tomcrypt_custom.h @@ -47,25 +47,25 @@ #ifndef XMEMSET #ifdef memset - #define LTC_NO_PROTOTYPES + #define LTC_NO_PROTOTYPES_MEMSET #endif #define XMEMSET memset #endif #ifndef XMEMCPY #ifdef memcpy - #define LTC_NO_PROTOTYPES + #define LTC_NO_PROTOTYPES_MEMCPY #endif #define XMEMCPY memcpy #endif #ifndef XMEMCMP #ifdef memcmp - #define LTC_NO_PROTOTYPES + #define LTC_NO_PROTOTYPES_MEMCMP #endif #define XMEMCMP memcmp #endif #ifndef XSTRCMP #ifdef strcmp - #define LTC_NO_PROTOTYPES + #define LTC_NO_PROTOTYPES_STRCMP #endif #define XSTRCMP strcmp #endif |