move notmuch test macro

diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index b91446567d41bc6c7d777dc7168d0805b1a7ca3d..304e0e0c53b12c1dec6cafb7185faa104c3a02af 100644 (file)
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -83,17 +83,6 @@ char *NmQueryWindowTimebase; ///< Config: (notmuch) Units for the time duration
 char *NmRecordTags; ///< Config: (notmuch) Tags to apply to the 'record' mailbox (sent mail)
 char *NmUnreadTag; ///< Config: (notmuch) Tag to use for unread messages
 
-#ifdef LIBNOTMUCH_CHECK_VERSION
-#undef LIBNOTMUCH_CHECK_VERSION
-#endif
-
-/* @def The definition in <notmuch.h> is broken */
-#define LIBNOTMUCH_CHECK_VERSION(major, minor, micro)                             \
-  (LIBNOTMUCH_MAJOR_VERSION > (major) ||                                          \
-   (LIBNOTMUCH_MAJOR_VERSION == (major) && LIBNOTMUCH_MINOR_VERSION > (minor)) || \
-   (LIBNOTMUCH_MAJOR_VERSION == (major) &&                                        \
-    LIBNOTMUCH_MINOR_VERSION == (minor) && LIBNOTMUCH_MICRO_VERSION >= (micro)))
-
 /**
  * string_to_query_type - Lookup a query type
  * @param str String to lookup

diff --git a/notmuch/notmuch_private.h b/notmuch/notmuch_private.h
index 43e16c688e9e0d87aed663ed3de9f3f968fecf26..e26724d601652a8a8733e6c583ab4ec2c5b6f1d1 100644 (file)
--- a/notmuch/notmuch_private.h
+++ b/notmuch/notmuch_private.h
@@ -27,6 +27,17 @@
 #ifndef MUTT_NOTMUCH_NOTMUCH_PRIVATE_H
 #define MUTT_NOTMUCH_NOTMUCH_PRIVATE_H
 
+#ifdef LIBNOTMUCH_CHECK_VERSION
+#undef LIBNOTMUCH_CHECK_VERSION
+#endif
+
+/* @def The definition in <notmuch.h> is broken */
+#define LIBNOTMUCH_CHECK_VERSION(major, minor, micro)                             \
+  (LIBNOTMUCH_MAJOR_VERSION > (major) ||                                          \
+   (LIBNOTMUCH_MAJOR_VERSION == (major) && LIBNOTMUCH_MINOR_VERSION > (minor)) || \
+   (LIBNOTMUCH_MAJOR_VERSION == (major) &&                                        \
+    LIBNOTMUCH_MINOR_VERSION == (minor) && LIBNOTMUCH_MICRO_VERSION >= (micro)))
+
 struct Mailbox;
 
 /**