From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 25 Jul 2005 04:20:39 +0000 (+0000)
Subject: (YYOPTIONAL_LOC): Define even if it's not a recent
X-Git-Tag: BISON-2_1~42
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/3bc00d6c4bc8e6b6a0f96276f18dc26d11eb18a8?ds=sidebyside

(YYOPTIONAL_LOC): Define even if it's not a recent
version of GCC, since the macro is used with non-GCC compilers.
---

diff --git a/data/glr.c b/data/glr.c
index 3ce4703d..75c6f981 100644
--- a/data/glr.c
+++ b/data/glr.c
@@ -261,19 +261,19 @@ b4_syncline([@oline@], [@ofile@])
 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
-# if !defined (__GNUC__) || __GNUC__ < 2 || \
-(__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if (!defined (__GNUC__) || __GNUC__ < 2 \
+      || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__)
 #  define __attribute__(Spec) /* empty */
-# else
-]b4_location_if([#  define YYOPTIONAL_LOC(Name) Name],[
-#  if defined (__cplusplus)
-#   define YYOPTIONAL_LOC(Name) /* empty */
-#  else
-#   define YYOPTIONAL_LOC(Name) Name __attribute__ ((__unused__))
-#  endif])[
 # endif
 #endif
 
+]b4_location_if([#define YYOPTIONAL_LOC(Name) Name],[
+#ifdef __cplusplus
+# define YYOPTIONAL_LOC(Name) /* empty */
+#else
+# define YYOPTIONAL_LOC(Name) Name __attribute__ ((__unused__))
+#endif])[
+
 #ifndef YYASSERT
 # define YYASSERT(condition) ((void) ((condition) || (abort (), 0)))
 #endif