Skip to content
Snippets Groups Projects
Commit 2a1a5985 authored by Drake Arconis's avatar Drake Arconis
Browse files

Merge

parents 4558d081 69bae52a
No related branches found
No related tags found
No related merge requests found
...@@ -998,9 +998,9 @@ ...@@ -998,9 +998,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>e52d7ec430004fc2a59e4dbf6f3b704e</string> <string>c788a259125bdbee7e362ff4a7b9fb4f</string>
<key>url</key> <key>url</key>
<string>https://bitbucket.org/alchemyviewer/publiclibs-darwin/downloads/google_breakpad-1400-darwin-201411052348.tar.bz2</string> <string>https://bitbucket.org/alchemyviewer/publiclibs-darwin/downloads/google_breakpad-1411-darwin-20141216.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>darwin</string> <string>darwin</string>
......
...@@ -44,7 +44,7 @@ std::string LLBase64::encode(const U8* input, size_t input_size) ...@@ -44,7 +44,7 @@ std::string LLBase64::encode(const U8* input, size_t input_size)
bio = BIO_push(b64, bio); bio = BIO_push(b64, bio);
BIO_write(bio, input, input_size); BIO_write(bio, input, input_size);
BIO_flush(bio); (void)BIO_flush(bio);
char *new_data; char *new_data;
size_t bytes_written = BIO_get_mem_data(bio, &new_data); size_t bytes_written = BIO_get_mem_data(bio, &new_data);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment