Fix the compile error [#442]
This commit is contained in:
parent
a9eaed18aa
commit
3c3aec340e
|
@ -5,7 +5,7 @@ FROM ${dist}:${tag}
|
||||||
MAINTAINER Sukchan Lee <acetcom@gmail.com>
|
MAINTAINER Sukchan Lee <acetcom@gmail.com>
|
||||||
|
|
||||||
RUN yum -y install epel-release
|
RUN yum -y install epel-release
|
||||||
RUN yum -y install https://centos7.iuscommunity.org/ius-release.rpm
|
#RUN yum -y install https://centos7.iuscommunity.org/ius-release.rpm
|
||||||
RUN yum -y update
|
RUN yum -y update
|
||||||
|
|
||||||
RUN yum -y install \
|
RUN yum -y install \
|
||||||
|
|
|
@ -37,7 +37,7 @@ libsbi_inc = include_directories('.')
|
||||||
sbi_cc_flags = ['-DOGS_SBI_COMPILATION']
|
sbi_cc_flags = ['-DOGS_SBI_COMPILATION']
|
||||||
|
|
||||||
libgnutls_dep = cc.find_library('gnutls', required : true)
|
libgnutls_dep = cc.find_library('gnutls', required : true)
|
||||||
libmicrohttpd_dep = dependency('libmicrohttpd')
|
libmicrohttpd_dep = dependency('libmicrohttpd', version: '>=0.9.40')
|
||||||
libcurl_dep = dependency('libcurl')
|
libcurl_dep = dependency('libcurl')
|
||||||
|
|
||||||
libsbi = library('ogssbi',
|
libsbi = library('ogssbi',
|
||||||
|
|
|
@ -213,7 +213,11 @@ void ogs_sbi_server_start(ogs_sbi_server_t *server, int (*cb)(
|
||||||
char buf[OGS_ADDRSTRLEN];
|
char buf[OGS_ADDRSTRLEN];
|
||||||
ogs_sockaddr_t *addr = NULL;
|
ogs_sockaddr_t *addr = NULL;
|
||||||
|
|
||||||
|
#if MHD_VERSION >= 0x00095300
|
||||||
unsigned int mhd_flags = MHD_USE_ERROR_LOG;
|
unsigned int mhd_flags = MHD_USE_ERROR_LOG;
|
||||||
|
#else
|
||||||
|
unsigned int mhd_flags = MHD_USE_DEBUG;
|
||||||
|
#endif
|
||||||
const union MHD_DaemonInfo *mhd_info = NULL;
|
const union MHD_DaemonInfo *mhd_info = NULL;
|
||||||
#define MAX_NUM_OF_MHD_OPTION_ITEM 8
|
#define MAX_NUM_OF_MHD_OPTION_ITEM 8
|
||||||
struct MHD_OptionItem mhd_ops[MAX_NUM_OF_MHD_OPTION_ITEM];
|
struct MHD_OptionItem mhd_ops[MAX_NUM_OF_MHD_OPTION_ITEM];
|
||||||
|
@ -244,10 +248,8 @@ void ogs_sbi_server_start(ogs_sbi_server_t *server, int (*cb)(
|
||||||
|
|
||||||
addr = server->addr;
|
addr = server->addr;
|
||||||
ogs_assert(addr);
|
ogs_assert(addr);
|
||||||
#if MHD_VERSION >= 0x00095208
|
|
||||||
if (addr->ogs_sa_family == AF_INET6)
|
if (addr->ogs_sa_family == AF_INET6)
|
||||||
mhd_flags |= MHD_USE_IPv6;
|
mhd_flags |= MHD_USE_IPv6;
|
||||||
#endif
|
|
||||||
mhd_ops[index].option = MHD_OPTION_SOCK_ADDR;
|
mhd_ops[index].option = MHD_OPTION_SOCK_ADDR;
|
||||||
mhd_ops[index].value = 0;
|
mhd_ops[index].value = 0;
|
||||||
mhd_ops[index].ptr_value = (void *)&addr->sa;
|
mhd_ops[index].ptr_value = (void *)&addr->sa;
|
||||||
|
|
Loading…
Reference in New Issue