From 6bea54805fdd0e60617428eb5a94884abdeefef9 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Thu, 4 Nov 2021 00:32:13 +0200 Subject: [PATCH] build: fix compiler warning guile: some clang warning and ensure we get the right Xapian in all places, and fileno is defined. --- guile/mu-guile-message.cc | 2 +- lib/index/meson.build | 3 ++- mu/tests/gmime-test.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/guile/mu-guile-message.cc b/guile/mu-guile-message.cc index 034a18ae..bbdd1598 100644 --- a/guile/mu-guile-message.cc +++ b/guile/mu-guile-message.cc @@ -98,7 +98,7 @@ check_flag(MuFlags flag, FlagData* fdata) return; switch (flag) { - case MU_FLAG_NONE: break; + case MU_FLAG_NONE: flag_scm = SCM_UNDEFINED; break; case MU_FLAG_NEW: flag_scm = SYMB_FLAG_NEW; break; case MU_FLAG_PASSED: flag_scm = SYMB_FLAG_PASSED; break; case MU_FLAG_REPLIED: flag_scm = SYMB_FLAG_REPLIED; break; diff --git a/lib/index/meson.build b/lib/index/meson.build index 01c90b13..34161aba 100644 --- a/lib/index/meson.build +++ b/lib/index/meson.build @@ -21,8 +21,9 @@ index_srcs=[ 'mu-scanner.cc' ] +xapian_incs = xapian_dep.get_pkgconfig_variable('includedir') lib_mu_index_inc_dep = declare_dependency( - include_directories: include_directories(['.', '..'])) + include_directories: include_directories(['.', '..', xapian_incs])) lib_mu_index=static_library('mu-index', [index_srcs], dependencies: [ config_h_dep, diff --git a/mu/tests/gmime-test.c b/mu/tests/gmime-test.c index 7e911bfe..45282f95 100644 --- a/mu/tests/gmime-test.c +++ b/mu/tests/gmime-test.c @@ -17,7 +17,7 @@ ** */ -#define _POSIX_C_SOURCE +#define _POSIX_C_SOURCE 1 #include #include