mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-10-06 20:23:43 +08:00
支持gcc4.7~gcc4.9
This commit is contained in:
parent
9cd016c9eb
commit
1d1182efd2
|
@ -27,19 +27,19 @@ void HttpClientImp::sendRequest(const string& url) {
|
||||||
#else
|
#else
|
||||||
_sslBox.reset(new SSL_Box(false));
|
_sslBox.reset(new SSL_Box(false));
|
||||||
_sslBox->setOnDecData([this](const char *data, uint32_t len){
|
_sslBox->setOnDecData([this](const char *data, uint32_t len){
|
||||||
#ifdef ANDROID
|
#if defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
public_onRecvBytes(data,len);
|
public_onRecvBytes(data,len);
|
||||||
#else//ANDROID
|
#else//defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
HttpClient::onRecvBytes(data,len);
|
HttpClient::onRecvBytes(data,len);
|
||||||
#endif//ANDROID
|
#endif//defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
});
|
});
|
||||||
_sslBox->setOnEncData([this](const char *data, uint32_t len){
|
_sslBox->setOnEncData([this](const char *data, uint32_t len){
|
||||||
|
|
||||||
#ifdef ANDROID
|
#if defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
public_send(data,len);
|
public_send(data,len);
|
||||||
#else//ANDROID
|
#else//defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
HttpClient::send(data,len);
|
HttpClient::send(data,len);
|
||||||
#endif//ANDROID
|
#endif//defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
});
|
});
|
||||||
#endif //ENABLE_OPENSSL
|
#endif //ENABLE_OPENSSL
|
||||||
|
|
||||||
|
|
|
@ -24,14 +24,14 @@ public:
|
||||||
virtual ~HttpClientImp();
|
virtual ~HttpClientImp();
|
||||||
virtual void sendRequest(const string &url) override;
|
virtual void sendRequest(const string &url) override;
|
||||||
|
|
||||||
#ifdef ANDROID
|
#if defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
void public_onRecvBytes(const char *data,int len){
|
void public_onRecvBytes(const char *data,int len){
|
||||||
HttpClient::onRecvBytes(data,len);
|
HttpClient::onRecvBytes(data,len);
|
||||||
}
|
}
|
||||||
void public_send(const char *data, uint32_t len){
|
void public_send(const char *data, uint32_t len){
|
||||||
HttpClient::send(data,len);
|
HttpClient::send(data,len);
|
||||||
}
|
}
|
||||||
#endif //ANDROID
|
#endif //defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
private:
|
private:
|
||||||
#ifdef ENABLE_OPENSSL
|
#ifdef ENABLE_OPENSSL
|
||||||
virtual void onRecvBytes(const char *data,int size) override;
|
virtual void onRecvBytes(const char *data,int size) override;
|
||||||
|
|
|
@ -22,18 +22,18 @@ public:
|
||||||
HttpsSession(const std::shared_ptr<ThreadPool> &pTh, const Socket::Ptr &pSock):
|
HttpsSession(const std::shared_ptr<ThreadPool> &pTh, const Socket::Ptr &pSock):
|
||||||
HttpSession(pTh,pSock){
|
HttpSession(pTh,pSock){
|
||||||
m_sslBox.setOnEncData([&](const char *data, uint32_t len){
|
m_sslBox.setOnEncData([&](const char *data, uint32_t len){
|
||||||
#ifdef ANDROID
|
#if defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
public_send(data,len);
|
public_send(data,len);
|
||||||
#else//ANDROID
|
#else//defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
HttpSession::send(data,len);
|
HttpSession::send(data,len);
|
||||||
#endif//ANDROID
|
#endif//defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
});
|
});
|
||||||
m_sslBox.setOnDecData([&](const char *data, uint32_t len){
|
m_sslBox.setOnDecData([&](const char *data, uint32_t len){
|
||||||
#ifdef ANDROID
|
#if defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
public_onRecv(data,len);
|
public_onRecv(data,len);
|
||||||
#else//ANDROID
|
#else//defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
HttpSession::onRecv(data,len);
|
HttpSession::onRecv(data,len);
|
||||||
#endif//ANDROID
|
#endif//defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
virtual ~HttpsSession(){
|
virtual ~HttpsSession(){
|
||||||
|
@ -43,14 +43,14 @@ public:
|
||||||
TimeTicker();
|
TimeTicker();
|
||||||
m_sslBox.onRecv(pBuf->data(), pBuf->size());
|
m_sslBox.onRecv(pBuf->data(), pBuf->size());
|
||||||
}
|
}
|
||||||
#ifdef ANDROID
|
#if defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
int public_send(const char *data, uint32_t len){
|
int public_send(const char *data, uint32_t len){
|
||||||
return HttpSession::send(data,len);
|
return HttpSession::send(data,len);
|
||||||
}
|
}
|
||||||
void public_onRecv(const char *data, uint32_t len){
|
void public_onRecv(const char *data, uint32_t len){
|
||||||
HttpSession::onRecv(data,len);
|
HttpSession::onRecv(data,len);
|
||||||
}
|
}
|
||||||
#endif//ANDROID
|
#endif//defined(__GNUC__) && (__GNUC__ < 5)
|
||||||
private:
|
private:
|
||||||
virtual int send(const string &buf) override{
|
virtual int send(const string &buf) override{
|
||||||
TimeTicker();
|
TimeTicker();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user