--- src/getargs.c	Sat Aug 25 10:55:03 2018
+++ src/getargs.c	Fri Sep 28 16:13:54 2018
@@ -360,6 +360,7 @@
       fputs (_("General help using GNU software: "
                "<http://www.gnu.org/gethelp/>.\n"),
              stdout);
+#ifdef LC_MESSAGES
       /* Don't output this redundant message for English locales.
          Note we still output for 'C' so that it gets included in the
          man page.  */
@@ -372,6 +373,7 @@
            email address.  */
         fputs (_("Report translation bugs to "
                  "<http://translationproject.org/team/>.\n"), stdout);
+#endif
       fputs (_("For complete documentation, run: info bison.\n"), stdout);
     }
 
--- src/uniqstr.c	Sat Aug 25 10:55:03 2018
+++ src/uniqstr.c	Fri Sep 28 16:13:57 2018
@@ -64,11 +64,21 @@
   length = vsnprintf (NULL, 0, format, args);
   va_end (args);
 
+#ifdef __GNUC__
   char res[length + 1];
   va_start (args, format);
   vsprintf (res, format, args);
   va_end (args);
   return uniqstr_new (res);
+#else
+  char *buff = malloc (length + 1);
+  va_start (args, format);
+  vsprintf (buff, format, args);
+  va_end (args);
+  uniqstr res = uniqstr_new (buff);
+  free (buff);
+  return res;
+#endif
 }
 
 /*------------------------------.