Skip to content

Commit

Permalink
Fix android build after refactor.
Browse files Browse the repository at this point in the history
  • Loading branch information
ras0219-msft committed Apr 8, 2016
1 parent aff4a1a commit 7c9189e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 2 additions & 0 deletions Release/src/http/client/x509_cert_utilities.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ bool verify_cert_chain_platform_specific(boost::asio::ssl::verify_context &verif
}

#if defined(ANDROID) || defined(__ANDROID__)
using namespace crossplat;

/// <summary>
/// Helper function to check return value and see if any exceptions
/// occurred when calling a JNI function.
Expand Down
8 changes: 2 additions & 6 deletions Release/src/http/common/http_msg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,6 @@ void http_headers::set_content_length(utility::size64_t length)

namespace details {

#ifdef _WIN32
# define CRLF _XPLATSTR("\r\n")
#else
# define CRLF std::string("\r\n")
#endif

utility::string_t flatten_http_headers(const http_headers &headers)
{
utility::string_t flattened_headers;
Expand All @@ -244,6 +238,7 @@ utility::string_t flatten_http_headers(const http_headers &headers)
return flattened_headers;
}

#if defined(_WIN32)
void parse_headers_string(_Inout_z_ utf16char *headersStr, http_headers &headers)
{
utf16char *context = nullptr;
Expand All @@ -263,6 +258,7 @@ void parse_headers_string(_Inout_z_ utf16char *headersStr, http_headers &headers
line = wcstok_s(nullptr, CRLF, &context);
}
}
#endif

}

Expand Down

0 comments on commit 7c9189e

Please sign in to comment.