Update android-config and fix build warning with android NDK
This commit is contained in:
parent
9cbedb16d0
commit
d3ca003346
|
@ -36,6 +36,11 @@ PATH=$TOOLCHAIN/bin:$PATH
|
||||||
--host=arm-linux-androideabi \
|
--host=arm-linux-androideabi \
|
||||||
--build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
|
--build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
|
||||||
--with-xml-prefix="$PREFIX" \
|
--with-xml-prefix="$PREFIX" \
|
||||||
|
--disable-python-bindings \
|
||||||
|
--disable-examples \
|
||||||
|
--enable-werror \
|
||||||
|
CC=clang \
|
||||||
|
CXX=clang++ \
|
||||||
CPPFLAGS="-I$PREFIX/include" \
|
CPPFLAGS="-I$PREFIX/include" \
|
||||||
PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
|
PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
|
||||||
LDFLAGS="-L$PREFIX/lib"
|
LDFLAGS="-L$PREFIX/lib"
|
||||||
|
|
|
@ -1784,6 +1784,7 @@ static int session_prep_frame(nghttp2_session *session,
|
||||||
} else {
|
} else {
|
||||||
/* Unreachable */
|
/* Unreachable */
|
||||||
assert(0);
|
assert(0);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2221,6 +2222,7 @@ static int session_after_frame_sent(nghttp2_session *session)
|
||||||
}
|
}
|
||||||
/* Unreachable */
|
/* Unreachable */
|
||||||
assert(0);
|
assert(0);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
ssize_t nghttp2_session_mem_send(nghttp2_session *session,
|
ssize_t nghttp2_session_mem_send(nghttp2_session *session,
|
||||||
|
|
|
@ -520,6 +520,7 @@ int Http2Session::initiate_connection()
|
||||||
|
|
||||||
// Unreachable
|
// Unreachable
|
||||||
DIE();
|
DIE();
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Http2Session::unwrap_free_bev()
|
void Http2Session::unwrap_free_bev()
|
||||||
|
|
|
@ -69,7 +69,7 @@ time_t timegm(struct tm *tm)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return t;
|
return (time_t)t;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* !HAVE_TIMEGM */
|
#endif /* !HAVE_TIMEGM */
|
||||||
|
|
Loading…
Reference in New Issue