Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
…into yhlibcurlwrite
  • Loading branch information
ityuhui committed Apr 11, 2020
commit 9d3bdc003f1328c1d2bc2e06919538b9a3cdac4c
3 changes: 3 additions & 0 deletions samples/client/petstore/c/src/apiClient.c
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,7 @@ char *strReplace(char *orig, char *rep, char *with) {
return result;
}

<<<<<<< HEAD
char *base64encode (const void *b64_encode_this, int encode_this_many_bytes){
#ifdef OPENSSL
BIO *b64_bio, *mem_bio; //Declares two OpenSSL BIOs: a base64 filter and a memory BIO.
Expand Down Expand Up @@ -561,3 +562,5 @@ char *base64decode (const void *b64_decode_this, int decode_this_many_bytes, int
return base64_decoded; //Returns base-64 decoded data with trailing null terminator.
#endif
}
=======
>>>>>>> e9d35c5a2a9257e33564464616662d1f8cc09234
You are viewing a condensed version of this merge commit. You can view the full changes here.