vcpkg/ports/vowpal-wabbit/fix-android-build.patch

76 lines
2.7 KiB
Diff

diff --git a/utl/flatbuffer/txt_to_flat.cc b/utl/flatbuffer/txt_to_flat.cc
index 180303b87..8543448c4 100644
--- a/utl/flatbuffer/txt_to_flat.cc
+++ b/utl/flatbuffer/txt_to_flat.cc
@@ -18,7 +18,6 @@
#include "vw/core/parse_regressor.h"
#include "vw_to_flat.h"
-#include <sys/timeb.h>
#include <fstream>
diff --git a/utl/flatbuffer/vw_to_flat.cc b/utl/flatbuffer/vw_to_flat.cc
index 32bcd9552..dd27c1dd4 100644
--- a/utl/flatbuffer/vw_to_flat.cc
+++ b/utl/flatbuffer/vw_to_flat.cc
@@ -13,7 +13,6 @@
#include "vw/core/reductions/cb/cb_algs.h"
#include "vw/core/shared_data.h"
-#include <sys/timeb.h>
#include <fstream>
#include <vector>
diff --git a/vowpalwabbit/allreduce/src/allreduce_sockets.cc b/vowpalwabbit/allreduce/src/allreduce_sockets.cc
index a61e5608a..b7ecece25 100644
--- a/vowpalwabbit/allreduce/src/allreduce_sockets.cc
+++ b/vowpalwabbit/allreduce/src/allreduce_sockets.cc
@@ -32,7 +32,6 @@ Alekh Agarwal and John Langford, with help Olivier Chapelle.
#include "vw/common/vw_exception.h"
#include "vw/io/logger.h"
-#include <sys/timeb.h>
// port is already in network order
socket_t VW::all_reduce_sockets::sock_connect(const uint32_t ip, const int port, VW::io::logger& logger)
diff --git a/vowpalwabbit/core/src/confidence_sequence.cc b/vowpalwabbit/core/src/confidence_sequence.cc
index fc4b35d91..0c2a40c2f 100644
--- a/vowpalwabbit/core/src/confidence_sequence.cc
+++ b/vowpalwabbit/core/src/confidence_sequence.cc
@@ -204,7 +204,7 @@ double confidence_sequence::approxpolygammaone(double b) const
double confidence_sequence::lblogwealth(double sumXt, double v, double eta, double s, double lb_alpha) const
{
-#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__EMSCRIPTEN__)
+#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__EMSCRIPTEN__) && !defined(__ANDROID__)
double zeta_s = std::riemann_zeta(s);
#else
double zeta_s = 10.584448464950803; // std::riemann_zeta(s) -- Assuming s=1.1 is constant
diff --git a/vowpalwabbit/core/src/parser.cc b/vowpalwabbit/core/src/parser.cc
index 9595b5fe0..d49c68757 100644
--- a/vowpalwabbit/core/src/parser.cc
+++ b/vowpalwabbit/core/src/parser.cc
@@ -53,9 +53,6 @@ int VW_GETPID() { return (int)::GetCurrentProcessId(); }
#else
# include <netdb.h>
# define VW_GETPID getpid
-#endif
-
-#if defined(__FreeBSD__) || defined(__APPLE__)
# include <netinet/in.h>
#endif
diff --git a/vowpalwabbit/core/src/reductions/bfgs.cc b/vowpalwabbit/core/src/reductions/bfgs.cc
index 2713eb0b5..56e871970 100644
--- a/vowpalwabbit/core/src/reductions/bfgs.cc
+++ b/vowpalwabbit/core/src/reductions/bfgs.cc
@@ -21,7 +21,6 @@ Implementation by Miro Dudik.
#include "vw/core/simple_label.h"
#include <fmt/format.h>
-#include <sys/timeb.h>
#include <cassert>
#include <cfloat>