Squashed redefinition warning on some systems.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index eb48a5ee72a897ebb3ad1bf44ef869fc1f1fff8c..ee1a03a7ea8bb8f011d68375f8c48269ac6be178 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <stdio.h>
@@ -34,10 +35,12 @@ char *spec_name_prefix; /* for -p.  */
 char *spec_file_prefix; /* for -b. */
 extern int fixed_outfiles;/* for -y */
   
+void usage PARAMS((FILE *));
+void getargs PARAMS((int, char *[]));
+
 extern char *program_name;
-extern char *version_string;
 
-extern void warns();   /* main.c */
+extern void warns PARAMS((char *, char *));    /* main.c */
 
 struct option longopts[] =
 {
@@ -60,8 +63,7 @@ struct option longopts[] =
 };
 
 void
-usage (stream)
-     FILE *stream;
+usage (FILE *stream)
 {
   fprintf (stream, _("\
 Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n\
@@ -75,9 +77,7 @@ Report bugs to bug-bison@gnu.org\n"),
 }
 
 void
-getargs(argc, argv)
-     int argc;
-     char *argv[];
+getargs (int argc, char *argv[])
 {
   register int c;
 
@@ -107,7 +107,7 @@ getargs(argc, argv)
          exit (0);
 
        case 'V':
-         printf ("%s", version_string);
+         printf ("%s\n", VERSION_STRING);
          exit (0);
          
        case 'v':