From 026e9b23ad7fd105b2b171cce0ea4ea965a30dd9 Mon Sep 17 00:00:00 2001 From: Ladislav Zezula Date: Sat, 15 May 2021 19:32:17 +0200 Subject: LTC_NO_PROTOTYPES splitted into multiple sub-macros --- src/libtomcrypt/src/headers/tomcrypt_cfg.h | 12 ++++++++++-- src/libtomcrypt/src/headers/tomcrypt_custom.h | 8 ++++---- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'src/libtomcrypt') diff --git a/src/libtomcrypt/src/headers/tomcrypt_cfg.h b/src/libtomcrypt/src/headers/tomcrypt_cfg.h index e266a49..15f4933 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 -- cgit v1.2.3 From 05d3a57b8a1ac88e22657290396a9b334a2bee1a Mon Sep 17 00:00:00 2001 From: Ladislav Zezula Date: Sat, 15 May 2021 19:34:58 +0200 Subject: Fixed #endif --- src/libtomcrypt/src/headers/tomcrypt_cfg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libtomcrypt') diff --git a/src/libtomcrypt/src/headers/tomcrypt_cfg.h b/src/libtomcrypt/src/headers/tomcrypt_cfg.h index 15f4933..335d55f 100644 --- a/src/libtomcrypt/src/headers/tomcrypt_cfg.h +++ b/src/libtomcrypt/src/headers/tomcrypt_cfg.h @@ -32,7 +32,7 @@ LTC_EXPORT void LTC_CALL XQSORT(void *base, size_t nmemb, size_t size, int(LTC_C /* change the clock function too */ LTC_EXPORT clock_t LTC_CALL XCLOCK(void); -#endif LTC_NO_PROTOTYPES +#endif // LTC_NO_PROTOTYPES /* various other functions */ #ifndef LTC_NO_PROTOTYPES_MEMCPY -- cgit v1.2.3