From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 26 Jun 2016 20:21:49 +0000 (+0200)
Subject: Fix GNUC_PREREQ for GCC 2.8.1 etc.
X-Git-Tag: emacs-26.0.90~1840^2~163
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d267aea2424783f5eefb6e733a6806ffd3323fa0;p=emacs.git

Fix GNUC_PREREQ for GCC 2.8.1 etc.

Problem reported by Eli Zaretskii in:
http://lists.gnu.org/archive/html/emacs-devel/2016-06/msg00608.html
* src/conf_post.h (GNUC_PREREQ): Port to GCC versions like GCC
2.8.1 (1998), which come before GCC 3.0 and which have nonzero
patchlevel numbers.
---

diff --git a/src/conf_post.h b/src/conf_post.h
index 69b981feef6..99aafbffae6 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -39,7 +39,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef __GNUC_MINOR__
 # define GNUC_PREREQ(v, w, x) false
 #elif ! defined __GNUC_PATCHLEVEL__
-# define GNUC_PREREQ(v, w, x) ((v) < __GNUC__ + ((w) <= __GNUC_MINOR__))
+# define GNUC_PREREQ(v, w, x) \
+    ((v) < __GNUC__ + ((w) < __GNUC_MINOR__ + ((x) == 0))
 #else
 # define GNUC_PREREQ(v, w, x) \
     ((v) < __GNUC__ + ((w) < __GNUC_MINOR__ + ((x) <= __GNUC_PATCHLEVEL__)))