* data/glr.c (YYSTACKEXPANDABLE): Don't define if already defined.

[bison.git] / src / assoc.c

diff --git a/src/assoc.c b/src/assoc.c
index 80a2b43c4fef221a85cb9daf42b017f11fd325d8..b816499c857fe37d2eeb56f76ddec00f50f921a5 100644 (file)
--- a/src/assoc.c
+++ b/src/assoc.c
@@ -15,20 +15,21 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #include "system.h"
+
 #include "assoc.h"
 
 
 const char *
-assoc_to_string (assoc_t assoc)
+assoc_to_string (assoc a)
 {
-  switch (assoc)
+  switch (a)
     {
     case undef_assoc:
-      return _("undefined associativity");
+      return "undefined associativity";
 
     case right_assoc:
       return "%right";