mirrors
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed stray merge failure marker debris.

This commit is contained in:
John Safranek 2018-06-27 10:40:03 -07:00
parent 554275ba71
commit 47497f5aaa
3 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/dox_comments/header_files/coding.h
View File

@ -198,10 +198,7 @@ int Base64_Encode_NoNl(const byte* in, word32 inLen, byte* out,
*/
WOLFSSL_API
int Base16_Decode(const byte* in, word32 inLen, byte* out, word32* outLen);
<<<<<<< HEAD
=======
>>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
/*!
\ingroup Base_Encoding

18
doc/dox_comments/header_files/memory.h
View File

@ -25,10 +25,7 @@
\sa XREALLOC
*/
WOLFSSL_API void* wolfSSL_Malloc(size_t size, void* heap, int type, const char* func, unsigned int line);
<<<<<<< HEAD
=======
>>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
/*!
\ingroup Memory
@ -59,10 +56,7 @@ WOLFSSL_API void* wolfSSL_Malloc(size_t size, void* heap, int type, const char*
\sa XREALLOC
*/
WOLFSSL_API void wolfSSL_Free(void *ptr, void* heap, int type, const char* func, unsigned int line);
<<<<<<< HEAD
=======
>>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
/*!
\ingroup Memory
@ -92,10 +86,7 @@ WOLFSSL_API void wolfSSL_Free(void *ptr, void* heap, int type, const char* func
\sa XREALLOC
*/
WOLFSSL_API void* wolfSSL_Realloc(void *ptr, size_t size, void* heap, int type, const char* func, unsigned int line);
<<<<<<< HEAD
=======
>>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
/*!
\ingroup Memory
@ -126,10 +117,7 @@ WOLFSSL_API void* wolfSSL_Realloc(void *ptr, size_t size, void* heap, int type,
\sa wolfSSL_SetAllocators
*/
WOLFSSL_API void* wolfSSL_Malloc(size_t size, void* heap, int type);
<<<<<<< HEAD
=======
>>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
/*!
\ingroup Memory
@ -164,10 +152,7 @@ WOLFSSL_API void* wolfSSL_Malloc(size_t size, void* heap, int type);
\sa wolfSSL_SetAllocators
*/
WOLFSSL_API void* wolfSSL_Realloc(void *ptr, size_t size, void* heap, int type);
<<<<<<< HEAD
=======
>>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
/*!
\ingroup Memory
@ -192,10 +177,7 @@ WOLFSSL_API void* wolfSSL_Realloc(void *ptr, size_t size, void* heap, int type);
\sa wolfSSL_SetAllocators
*/
WOLFSSL_API void wolfSSL_Free(void *ptr, const char* func, unsigned int line);
<<<<<<< HEAD
=======
>>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
/*!
\ingroup Memory

6
doc/dox_comments/header_files/random.h
View File

@ -25,10 +25,7 @@
\sa wc_FreeNetRandom
*/
WOLFSSL_API int wc_InitNetRandom(const char*, wnr_hmac_key, int);
<<<<<<< HEAD
=======
>>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
/*!
\ingroup Random
@ -51,10 +48,7 @@ WOLFSSL_API int wc_InitNetRandom(const char*, wnr_hmac_key, int);
\sa wc_InitNetRandom
*/
WOLFSSL_API int wc_FreeNetRandom(void);
<<<<<<< HEAD
=======
>>>>>>> d60b16c5b8c19cc61db4a5c3f5e085a7a158cd28
/*!
\ingroup Random