[gdb/build] Add CXX_DIALECT to CXX

[deliverable/binutils-gdb.git] / binutils / windres.c

diff --git a/binutils/windres.c b/binutils/windres.c
index 76558484b8cfc3ed4708ec9fb65fb2e866abe085..2b626a29fb68ada1cc012a267a60d72c1335bea9 100644 (file)
--- a/binutils/windres.c
+++ b/binutils/windres.c
@@ -1,5 +1,5 @@
 /* windres.c -- a program to manipulate Windows resources
-   Copyright (C) 1997-2018 Free Software Foundation, Inc.
+   Copyright (C) 1997-2021 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
    Rewritten by Kai Tietz, Onevision.
 
@@ -48,7 +48,7 @@
 
 int verbose = 0;
 
-int target_is_bigendian = 0;
+bool target_is_bigendian = 0;
 const char *def_target_arch;
 
 static void set_endianness (bfd *, const char *);
@@ -527,6 +527,8 @@ extended_menuitems (const rc_menuitem *menuitems)
                | MENUITEM_HELP
                | MENUITEM_INACTIVE
                | MENUITEM_MENUBARBREAK
+               | MENUITEM_BITMAP
+               | MENUITEM_OWNERDRAW
                | MENUITEM_MENUBREAK))
          != 0)
        return 1;
@@ -701,20 +703,20 @@ quot (const char *string)
   const char *src;
   char *dest;
 
-  if ((buflen < slen * 2 + 2) || ! buf)
+  if ((buflen < slen * 2 + 3) || ! buf)
     {
-      buflen = slen * 2 + 2;
-      if (buf)
-       free (buf);
+      buflen = slen * 2 + 3;
+      free (buf);
       buf = (char *) xmalloc (buflen);
     }
 
-  for (src=string, dest=buf; *src; src++, dest++)
+  for (src = string, dest = buf; *src; src++, dest++)
     {
       if (*src == '(' || *src == ')' || *src == ' ')
        *dest++ = '\\';
       *dest = *src;
     }
+
   *dest = 0;
   return buf;
 }
@@ -797,12 +799,10 @@ main (int argc, char **argv)
   rc_res_directory *resources;
   int use_temp_file;
 
-#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
+#ifdef HAVE_LC_MESSAGES
   setlocale (LC_MESSAGES, "");
 #endif
-#if defined (HAVE_SETLOCALE)
   setlocale (LC_CTYPE, "");
-#endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
@@ -812,7 +812,8 @@ main (int argc, char **argv)
 
   expandargv (&argc, &argv);
 
-  bfd_init ();
+  if (bfd_init () != BFD_INIT_MAGIC)
+    fatal (_("fatal error: libbfd ABI mismatch"));
   set_default_bfd_target ();
 
   res_init ();
@@ -883,7 +884,13 @@ main (int argc, char **argv)
          break;
 
        case OPTION_PREPROCESSOR:
-         preprocessor = optarg;
+         if (strchr (optarg, ' '))
+           {
+             if (asprintf (& preprocessor, "\"%s\"", optarg) == -1)
+               preprocessor = optarg;
+           }
+         else
+           preprocessor = optarg;          
          break;
 
        case OPTION_PREPROCESSOR_ARG: