Merge remote-tracking branch 'origin/maint'

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 5c07fb3dd8b68f2732dcaddfb6da72ee59f3eb6b..18432b49ee2cadca2809e6f323af66381e9a91bc 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,6 +1,6 @@
 /* Declaration for error-reporting function for Bison.
 
-   Copyright (C) 2000-2002, 2004-2006, 2009-2011 Free Software
+   Copyright (C) 2000-2002, 2004-2006, 2009-2012 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -23,6 +23,7 @@
 #include "system.h"
 
 #include <stdarg.h>
+#include <progname.h>
 
 #include "complain.h"
 #include "files.h"
@@ -47,8 +48,8 @@ static unsigned *indent_ptr = 0;
 static
 void
 error_message (location *loc,
-              const char *prefix,
-              const char *message, va_list args)
+               const char *prefix,
+               const char *message, va_list args)
 {
   unsigned pos = 0;
 
@@ -81,12 +82,12 @@ error_message (location *loc,
 }
 
 /** Wrap error_message() with varargs handling. */
-#define ERROR_MESSAGE(Loc, Prefix, Message)    \
-{                                              \
-  va_list args;                                        \
-  va_start (args, Message);                    \
-  error_message (Loc, Prefix, Message, args);  \
-  va_end (args);                               \
+#define ERROR_MESSAGE(Loc, Prefix, Message)     \
+{                                               \
+  va_list args;                                 \
+  va_start (args, Message);                     \
+  error_message (Loc, Prefix, Message, args);   \
+  va_end (args);                                \
 }