smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation error under win32_* 

ERROR is a macro under Windows
This commit is contained in:
Veloman Yunkan 2020-05-26 01:58:17 +04:00
parent 6b43438b74
commit 37032892a4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/response.cpp
View File

@ -273,7 +273,7 @@ MHD_Response*
Response::create_mhd_response(const RequestContext& request) Response::create_mhd_response(const RequestContext& request)
{ {
switch (m_mode) { switch (m_mode) {
case ResponseMode::ERROR: case ResponseMode::ERROR_RESPONSE:
return create_error_response(request); return create_error_response(request);
case ResponseMode::RAW_CONTENT : case ResponseMode::RAW_CONTENT :
@ -292,7 +292,7 @@ int Response::send(const RequestContext& request, MHD_Connection* connection)
{ {
MHD_Response* response = create_mhd_response(request); MHD_Response* response = create_mhd_response(request);
if ( m_mode != ResponseMode::ERROR ) { if ( m_mode != ResponseMode::ERROR_RESPONSE ) {
MHD_add_response_header(response, "Access-Control-Allow-Origin", "*"); MHD_add_response_header(response, "Access-Control-Allow-Origin", "*");
MHD_add_response_header(response, MHD_HTTP_HEADER_CACHE_CONTROL, MHD_add_response_header(response, MHD_HTTP_HEADER_CACHE_CONTROL,
m_etag.get_option(ETag::CACHEABLE_ENTITY) ? "max-age=2723040, public" : "no-cache, no-store, must-revalidate"); m_etag.get_option(ETag::CACHEABLE_ENTITY) ? "max-age=2723040, public" : "no-cache, no-store, must-revalidate");
@ -345,7 +345,7 @@ void Response::set_entry(const Entry& entry, const RequestContext& request) {
} else if ( m_byteRange.kind() == ByteRange::INVALID ) { } else if ( m_byteRange.kind() == ByteRange::INVALID ) {
set_code(416); set_code(416);
set_content(""); set_content("");
m_mode = ResponseMode::ERROR; m_mode = ResponseMode::ERROR_RESPONSE;
} }
} }

2
src/server/response.h
View File

@ -35,7 +35,7 @@ extern "C" {
namespace kiwix { namespace kiwix {
enum class ResponseMode { enum class ResponseMode {
ERROR, ERROR_RESPONSE,
RAW_CONTENT, RAW_CONTENT,
REDIRECTION, REDIRECTION,
ENTRY ENTRY