unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
* [PATCH] lib: fix build on !HAVE_XAPIAN_COMPACT
@ 2013-10-28 14:09 Jani Nikula
  2013-10-28 15:31 ` Tomi Ollila
  2013-10-31  0:21 ` David Bremner
  0 siblings, 2 replies; 3+ messages in thread
From: Jani Nikula @ 2013-10-28 14:09 UTC (permalink / raw)
  To: notmuch

Minimal change to build notmuch against xapian that doesn't have
compaction support.
---
 lib/database.cc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lib/database.cc b/lib/database.cc
index 06f1c0a..20e5ec2 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -944,7 +944,9 @@ DONE:
 }
 #else
 notmuch_status_t
-notmuch_database_compact_close (unused (notmuch_database_t *notmuch))
+notmuch_database_compact (unused (const char* path),
+			  unused (const char* backup_path),
+			  unused (notmuch_compact_status_cb_t status_cb))
 {
     fprintf (stderr, "notmuch was compiled against a xapian version lacking compaction support.\n");
     return NOTMUCH_STATUS_UNSUPPORTED_OPERATION;
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] lib: fix build on !HAVE_XAPIAN_COMPACT
  2013-10-28 14:09 [PATCH] lib: fix build on !HAVE_XAPIAN_COMPACT Jani Nikula
@ 2013-10-28 15:31 ` Tomi Ollila
  2013-10-31  0:21 ` David Bremner
  1 sibling, 0 replies; 3+ messages in thread
From: Tomi Ollila @ 2013-10-28 15:31 UTC (permalink / raw)
  To: Jani Nikula, notmuch

On Mon, Oct 28 2013, Jani Nikula <jani@nikula.org> wrote:

> Minimal change to build notmuch against xapian that doesn't have
> compaction support.
> ---

LGTM.

Tomi


>  lib/database.cc |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/lib/database.cc b/lib/database.cc
> index 06f1c0a..20e5ec2 100644
> --- a/lib/database.cc
> +++ b/lib/database.cc
> @@ -944,7 +944,9 @@ DONE:
>  }
>  #else
>  notmuch_status_t
> -notmuch_database_compact_close (unused (notmuch_database_t *notmuch))
> +notmuch_database_compact (unused (const char* path),
> +			  unused (const char* backup_path),
> +			  unused (notmuch_compact_status_cb_t status_cb))
>  {
>      fprintf (stderr, "notmuch was compiled against a xapian version lacking compaction support.\n");
>      return NOTMUCH_STATUS_UNSUPPORTED_OPERATION;
> -- 
> 1.7.2.5
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] lib: fix build on !HAVE_XAPIAN_COMPACT
  2013-10-28 14:09 [PATCH] lib: fix build on !HAVE_XAPIAN_COMPACT Jani Nikula
  2013-10-28 15:31 ` Tomi Ollila
@ 2013-10-31  0:21 ` David Bremner
  1 sibling, 0 replies; 3+ messages in thread
From: David Bremner @ 2013-10-31  0:21 UTC (permalink / raw)
  To: Jani Nikula, notmuch

Jani Nikula <jani@nikula.org> writes:

> Minimal change to build notmuch against xapian that doesn't have
> compaction support.

pushed.

d

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-10-31  0:21 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-28 14:09 [PATCH] lib: fix build on !HAVE_XAPIAN_COMPACT Jani Nikula
2013-10-28 15:31 ` Tomi Ollila
2013-10-31  0:21 ` David Bremner

Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).