From e593bde8756791cbf0ceace68c9fd2f0c71f379f Mon Sep 17 00:00:00 2001
From: Timothy Stack <timothyshanestack@gmail.com>
Date: Tue, 30 Mar 2021 22:50:10 -0700
Subject: [PATCH] [build] fix some issues on xenial32

---
 src/command_executor.cc      | 1 +
 src/files_sub_source.cc      | 4 ++--
 src/line_buffer.hh           | 2 +-
 src/lnav.cc                  | 6 ++++--
 src/sql_commands.cc          | 4 +++-
 src/sqlite-extension-func.cc | 2 ++
 test/test_stubs.cc           | 4 +++-
 7 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/command_executor.cc b/src/command_executor.cc
index 84d8c608..2b7685c6 100644
--- a/src/command_executor.cc
+++ b/src/command_executor.cc
@@ -32,6 +32,7 @@
 #include <vector>
 
 #include "base/string_util.hh"
+#include "base/injector.hh"
 #include "yajlpp/json_ptr.hh"
 #include "lnav.hh"
 #include "log_format_loader.hh"
diff --git a/src/files_sub_source.cc b/src/files_sub_source.cc
index 94ffe43c..1332a1e4 100644
--- a/src/files_sub_source.cc
+++ b/src/files_sub_source.cc
@@ -164,7 +164,7 @@ void files_sub_source::text_value_for_line(textview_curses &tc, int line,
     const auto &fc = lnav_data.ld_active_files;
     auto filename_width =
         std::min(fc.fc_largest_path_length,
-                 std::max((size_t) 40, dim.second - 30));
+                 std::max((size_t) 40, (size_t) dim.second - 30));
 
     if (line < fc.fc_name_to_errors.size()) {
         auto iter = fc.fc_name_to_errors.begin();
@@ -223,7 +223,7 @@ void files_sub_source::text_attrs_for_line(textview_curses &tc, int line,
     const auto dim = tc.get_dimensions();
     auto filename_width =
         std::min(fc.fc_largest_path_length,
-                 std::max((size_t) 40, dim.second - 30));
+                 std::max((size_t) 40, (size_t) dim.second - 30));
 
     if (selected) {
         value_out.emplace_back(line_range{0, 1}, &view_curses::VC_GRAPHIC, ACS_RARROW);
diff --git a/src/line_buffer.hh b/src/line_buffer.hh
index 51deb9c5..2e90fbe2 100644
--- a/src/line_buffer.hh
+++ b/src/line_buffer.hh
@@ -121,7 +121,7 @@ public:
             unsigned char bits = 0;
             unsigned char in_bits = 0;
             Bytef index[GZ_WINSIZE];
-            indexDict(z_stream const & s, const off_t size) {
+            indexDict(z_stream const & s, const file_size_t size) {
                 assert((s.data_type & GZ_END_OF_BLOCK_MASK));
                 assert(!(s.data_type & GZ_END_OF_FILE_MASK));
                 assert(size >= s.avail_out + GZ_WINSIZE);
diff --git a/src/lnav.cc b/src/lnav.cc
index 8ac1aa4f..fd4f1b21 100644
--- a/src/lnav.cc
+++ b/src/lnav.cc
@@ -253,15 +253,17 @@ static auto bound_curl =
     injector::bind_multiple<isc::service>()
         .add_singleton<curl_looper, services::curl_streamer_t>();
 
+namespace injector {
 template<>
-void injector::force_linking(last_relative_time_tag anno)
+void force_linking(last_relative_time_tag anno)
 {
 }
 
 template<>
-void injector::force_linking(services::curl_streamer_t anno)
+void force_linking(services::curl_streamer_t anno)
 {
 }
+}
 
 bool setup_logline_table(exec_context &ec)
 {
diff --git a/src/sql_commands.cc b/src/sql_commands.cc
index c04efd19..9bdc37c5 100644
--- a/src/sql_commands.cc
+++ b/src/sql_commands.cc
@@ -251,7 +251,9 @@ static auto bound_sql_cmd_map = injector::bind<
     return &sql_cmd_map;
 });
 
+namespace injector {
 template<>
-void injector::force_linking(sql_cmd_map_tag anno)
+void force_linking(sql_cmd_map_tag anno)
 {
 }
+}
diff --git a/src/sqlite-extension-func.cc b/src/sqlite-extension-func.cc
index fdcc1139..000fc78d 100644
--- a/src/sqlite-extension-func.cc
+++ b/src/sqlite-extension-func.cc
@@ -43,6 +43,8 @@
 using namespace std;
 
 extern "C" {
+struct sqlite3_api_routines;
+
 int sqlite3_series_init(
     sqlite3 *db,
     char **pzErrMsg,
diff --git a/test/test_stubs.cc b/test/test_stubs.cc
index c9d44e13..6ba1d0d4 100644
--- a/test/test_stubs.cc
+++ b/test/test_stubs.cc
@@ -65,7 +65,9 @@ textview_curses *get_textview_for_mode(ln_mode_t mode)
 
 readline_context::command_map_t lnav_commands;
 
+namespace injector {
 template<>
-void injector::force_linking(services::curl_streamer_t anno)
+void force_linking(services::curl_streamer_t anno)
 {
 }
+}