Implement a workaround for GNU mak jobserver

[deliverable/binutils-gdb.git] / binutils / rcparse.y

diff --git a/binutils/rcparse.y b/binutils/rcparse.y
index 78ce917e233c5efdba82c409e2d913c949bba531..97f4a5adb1e608f339663ebea97acc5459163a33 100644 (file)
--- a/binutils/rcparse.y
+++ b/binutils/rcparse.y
@@ -1,5 +1,5 @@
 %{ /* rcparse.y -- parser for Windows rc files
-   Copyright (C) 1997-2020 Free Software Foundation, Inc.
+   Copyright (C) 1997-2021 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
    Extended by Kai Tietz, Onevision.
 
@@ -124,7 +124,7 @@ static const rc_res_id res_null_text = { 1, {{0, &null_unichar}}};
 %token ICON
 %token ANICURSOR ANIICON DLGINCLUDE DLGINIT FONTDIR HTML MANIFEST PLUGPLAY VXD TOOLBAR BUTTON
 %token LANGUAGE CHARACTERISTICS VERSIONK
-%token MENU MENUEX MENUITEM SEPARATOR POPUP CHECKED GRAYED HELP INACTIVE
+%token MENU MENUEX MENUITEM SEPARATOR POPUP CHECKED GRAYED HELP INACTIVE OWNERDRAW
 %token MENUBARBREAK MENUBREAK
 %token MESSAGETABLE
 %token RCDATA
@@ -571,7 +571,7 @@ control:
        | AUTOCHECKBOX optresidc
            {
              default_style = BS_AUTOCHECKBOX | WS_TABSTOP;
-             base_style = BS_AUTOCHECKBOX;
+             base_style = BS_AUTOCHECKBOX | WS_TABSTOP;
              class.named = 0;
              class.u.id = CTL_BUTTON;
              res_text_field = $2;
@@ -1088,6 +1088,14 @@ menuitem_flag:
          {
            $$ = MENUITEM_MENUBREAK;
          }
+       | BITMAP
+         {
+           $$ = MENUITEM_BITMAP;
+         }
+       | OWNERDRAW
+         {
+           $$ = MENUITEM_OWNERDRAW;
+         }
        ;
 
 /* Menuex resources.  */