diff options
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/Http.cpp | 13 | ||||
| -rw-r--r-- | osdep/Phy.hpp | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/osdep/Http.cpp b/osdep/Http.cpp index 4fe298b3..064ccd0c 100644 --- a/osdep/Http.cpp +++ b/osdep/Http.cpp @@ -48,6 +48,8 @@ static int ShttpOnValue(http_parser *parser,const char *ptr,size_t length); static int ShttpOnHeadersComplete(http_parser *parser); static int ShttpOnBody(http_parser *parser,const char *ptr,size_t length); static int ShttpOnMessageComplete(http_parser *parser); + +#if (HTTP_PARSER_VERSION_MAJOR >= 2) && (HTTP_PARSER_VERSION_MINOR >= 1) static const struct http_parser_settings HTTP_PARSER_SETTINGS = { ShttpOnMessageBegin, ShttpOnUrl, @@ -58,6 +60,17 @@ static const struct http_parser_settings HTTP_PARSER_SETTINGS = { ShttpOnBody, ShttpOnMessageComplete }; +#else +static const struct http_parser_settings HTTP_PARSER_SETTINGS = { + ShttpOnMessageBegin, + ShttpOnUrl, + ShttpOnHeaderField, + ShttpOnValue, + ShttpOnHeadersComplete, + ShttpOnBody, + ShttpOnMessageComplete +}; +#endif struct HttpPhyHandler { diff --git a/osdep/Phy.hpp b/osdep/Phy.hpp index 03eb84c2..1b08f30a 100644 --- a/osdep/Phy.hpp +++ b/osdep/Phy.hpp @@ -252,7 +252,7 @@ public: #if defined(_WIN32) || defined(_WIN64) ::send(_whackSendSocket,(const char *)this,1,0); #else - (void)::write(_whackSendSocket,(PhySocket *)this,1); + (void)(::write(_whackSendSocket,(PhySocket *)this,1)); #endif } @@ -871,7 +871,7 @@ public: #if defined(_WIN32) || defined(_WIN64) ::recv(_whackReceiveSocket,tmp,16,0); #else - (void)::read(_whackReceiveSocket,tmp,16); + (void)(::read(_whackReceiveSocket,tmp,16)); #endif } |