Re: [PATCH] lib: have two definitions of NOTMUCH_DEPRECATED macro

diff --git a/ae/0b868634881e8127e90b62ffd2dcada3b87ad0 b/ae/0b868634881e8127e90b62ffd2dcada3b87ad0
new file mode 100644 (file)
index 0000000..206f909
--- /dev/null
+++ b/ae/0b868634881e8127e90b62ffd2dcada3b87ad0
@@ -0,0 +1,136 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 791E06DE17E7\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Dec 2015 03:53:13 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.543\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.543 tagged_above=-999 required=5 tests=[AWL=0.177,\r
+  DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id w2ixne8PCLK4 for <notmuch@notmuchmail.org>;\r
+ Tue, 29 Dec 2015 03:53:10 -0800 (PST)\r
+Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com\r
+ [74.125.82.48]) by arlo.cworth.org (Postfix) with ESMTPS id 75A7A6DE17E1 for\r
+ <notmuch@notmuchmail.org>; Tue, 29 Dec 2015 03:53:10 -0800 (PST)\r
+Received: by mail-wm0-f48.google.com with SMTP id f206so35548007wmf.0\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Dec 2015 03:53:10 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=nikula-org.20150623.gappssmtp.com; s=20150623;\r
+ h=from:to:cc:subject:in-reply-to:references:user-agent:date\r
+ :message-id:mime-version:content-type;\r
+ bh=gJDb91SBvAJdrqd0GE0Fa3//0HXVbMQfBxs6e1NQHyg=;\r
+ b=Sij/8QYbjTHgmwWM6UfRPVzv8saMMxu7KQO7tHTUYJsz23LIlsFIsL54negmhnKjoU\r
+ g51A7rHLCuAZUc8TMBztdLNsgvDXf4DQuULt+hR5pKnQ5Ju/ot6oHEGe01k9s4pRQFND\r
+ FJcf+Pn7DUSrtxhTcRTCV56BN11TpWyezzXXFoVVohYzlwUF03gy9yevhwTMvJDm3b6R\r
+ p2obn1TAQdqmFNXNiWs+R9Ea6ifPPx2epLzAi3rmPmmsUgXIgl2ok5swWz9DVzpj9QFQ\r
+ 73CZ0VHxGyBWzvyBhoWvcb7V3z+bx9Gufajbl2gyAHfjyR0fG+bNa90oM2erE1g4VA4n\r
+ RXiQ==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:in-reply-to:references\r
+ :user-agent:date:message-id:mime-version:content-type;\r
+ bh=gJDb91SBvAJdrqd0GE0Fa3//0HXVbMQfBxs6e1NQHyg=;\r
+ b=Lbt5ovUc/UaM0+0/zSvy+9MpEwMB9R+edOFLViSUboTGrL2OBuS4VHA8IMQY1/M6gS\r
+ 3wo9BMBiT3OOVbc1yjZ/xp/fC0Y39LDh+Az/XpBYF0JzXGb+YkGsi1wdjl6J6nn6jVG9\r
+ VVz2KO8C6YoEfq85D1Sb8UMJhTL/MeZJJPuX9lBGIwIt9uZf2ahCOS1yc8Gqe0p0GAzP\r
+ fmUQdsGLd8nHkU7tTMyoEVeWq8FBcQeGYSuCeYtmVKTmX7G7nhAveiou0CyQZ6cUpoK+\r
+ yM632h5S1Y/vsoZn7Uanm3ewcBUial5OvSiHZxU2MOPB2sMiAByabbI+jEaKnSPp8NvL\r
+ v5lQ==\r
+X-Gm-Message-State: ALoCoQlfxClOY5bOx6WK5O3S6xogGiWmyhe5qC9l04Ps6wk777iph5BVLkbWhOwuQTg5VeqZu3g8bw8B1pgxbj6KGwZJ1Ok4qA==\r
+X-Received: by 10.195.18.100 with SMTP id gl4mr6327520wjd.177.1451389988307;\r
+ Tue, 29 Dec 2015 03:53:08 -0800 (PST)\r
+Received: from localhost (mobile-access-bceee6-244.dhcp.inet.fi.\r
+ [188.238.230.244])\r
+ by smtp.gmail.com with ESMTPSA id u69sm19259063wmu.20.2015.12.29.03.53.07\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Tue, 29 Dec 2015 03:53:07 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Cc: tomi.ollila@iki.fi\r
+Subject: Re: [PATCH] lib: have two definitions of NOTMUCH_DEPRECATED macro\r
+In-Reply-To: <1439303834-27030-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <1439303834-27030-1-git-send-email-tomi.ollila@iki.fi>\r
+User-Agent: Notmuch/0.21+27~g2b12735 (http://notmuchmail.org) Emacs/24.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Tue, 29 Dec 2015 13:52:20 +0200\r
+Message-ID: <87k2nxh3pn.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 29 Dec 2015 11:53:13 -0000\r
+\r
+On Tue, 11 Aug 2015, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
+> Some compilers (older than gcc 4.5 and clang 2.9) do support\r
+> __attribute__ ((deprecated)) but not\r
+> __attribute__ ((deprecated("message"))).\r
+>\r
+> Check (clang) and know (gcc) which versions support which variants\r
+> and make two definitions of define NOTMUCH_DEPRECATED macro;\r
+> one with and and one without the ("message") part.\r
+>\r
+> __has_extension() replacement was modeled after __has_attribute()\r
+> definition in compat/function-attributes.h. Thanks Justus.\r
+> ---\r
+>  lib/notmuch.h | 14 ++++++++++++++\r
+>  1 file changed, 14 insertions(+)\r
+>\r
+> diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+> index b1f5bfa..3f4621b 100644\r
+> --- a/lib/notmuch.h\r
+> +++ b/lib/notmuch.h\r
+> @@ -59,8 +59,22 @@ NOTMUCH_BEGIN_DECLS\r
+>  #define LIBNOTMUCH_MINOR_VERSION    3\r
+>  #define LIBNOTMUCH_MICRO_VERSION    0\r
+>  \r
+> +/* clang provides this macro to test for support for language\r
+> + * extensions. If it isn't defined, this provides a compatibility\r
+> + * macro for other compilers.\r
+> + */\r
+> +#ifndef __has_extension\r
+> +#define __has_extension(x) 0\r
+> +#endif\r
+\r
+This file is included by the users of the library, and thus this\r
+definition leaks to our users. It might cause problems if the users have\r
+different expectations for handling ifndef __has_extension. I don't\r
+think we should define things outside of our namespace in notmuch.h.\r
+\r
+BR,\r
+Jani.\r
+\r
+> +\r
+> +#if __clang__ && __has_extension(attribute_deprecated_with_message) || \\r
+> +    __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 5\r
+>  #define NOTMUCH_DEPRECATED(major,minor) \\r
+>      __attribute__ ((deprecated ("function deprecated as of libnotmuch " #major "." #minor)))\r
+> +#else\r
+> +#define NOTMUCH_DEPRECATED(major,minor) __attribute__ ((deprecated))\r
+> +#endif\r
+> +\r
+>  #endif /* __DOXYGEN__ */\r
+>  \r
+>  /**\r
+> -- \r
+> 2.4.3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r