* rcparse.y (styles): use SUBLANG_SHIFT instead of 8 (or the more

correct 10).
* resrc.c (write_rc_resource): Likewise.
* windres.h (SUBLANG_SHIFT): Define - as 10.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 31de7a992a14614ba66e6eab01ab9dfe7df5a2b2..40ca327593e755f7f7a95d42bdc0db52692c6b75 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-16  DJ Delorie  <dj@redhat.com>
+
+       * rcparse.y (styles): use SUBLANG_SHIFT instead of 8 (or the more
+       correct 10).
+       * resrc.c (write_rc_resource): Likewise.
+       * windres.h (SUBLANG_SHIFT): Define - as 10.
+
 2001-07-15  Nick Clifton  <nickc@cambridge.redhat.com>
 
        * MAINTAINERS: Add Christian Groessler as maintainer for z8k port.

diff --git a/binutils/rcparse.y b/binutils/rcparse.y
index 89004e7c0bea973fc67b6e489be1a9cafb19539a..f2378c031594695d4b802f92600cb97d167b4e66 100644 (file)
--- a/binutils/rcparse.y
+++ b/binutils/rcparse.y
@@ -455,7 +455,7 @@ styles:
          }
        | styles LANGUAGE numexpr cnumexpr
          {
-           sub_res_info.language = $3 | ($4 << 8);
+           sub_res_info.language = $3 | ($4 << SUBLANG_SHIFT);
          }
        | styles VERSIONK numexpr
          {
@@ -874,7 +874,7 @@ icon:
 language:
          LANGUAGE numexpr cnumexpr
          {
-           language = $2 | ($3 << 8);
+           language = $2 | ($3 << SUBLANG_SHIFT);
          }
        ;
 
@@ -1329,7 +1329,7 @@ suboptions:
        | suboptions LANGUAGE numexpr cnumexpr
          {
            $$ = $1;
-           $$.language = $3 | ($4 << 8);
+           $$.language = $3 | ($4 << SUBLANG_SHIFT);
          }
        | suboptions VERSIONK numexpr
          {

diff --git a/binutils/resrc.c b/binutils/resrc.c
index fca874ae351f85a4802cd5ac2efcbfc2c2f53b30..a29a66424d1a71eec69c49e1f2a20e03a3aa5dee 100644 (file)
--- a/binutils/resrc.c
+++ b/binutils/resrc.c
@@ -1889,8 +1889,8 @@ write_rc_resource (e, type, name, res, language)
       if (res->res_info.language != 0 && res->res_info.language != *language)
        fprintf (e, "%sLANGUAGE %d, %d\n",
                 modifiers ? "// " : "",
-                res->res_info.language & 0xff,
-                (res->res_info.language >> 8) & 0xff);
+                res->res_info.language & ((1<<SUBLANG_SHIFT)-1),
+                (res->res_info.language >> SUBLANG_SHIFT) & 0xff);
       if (res->res_info.characteristics != 0)
        fprintf (e, "%sCHARACTERISTICS %lu\n",
                 modifiers ? "// " : "",

diff --git a/binutils/windres.h b/binutils/windres.h
index 321be23f60431a501ede5ac7123b8596578b2e0a..157d7514f4aee58478e0c6c63178b9fbb6af01db 100644 (file)
--- a/binutils/windres.h
+++ b/binutils/windres.h
@@ -184,6 +184,8 @@ struct res_resource
   struct res_coff_info coff_info;
 };
 
+#define SUBLANG_SHIFT 10
+
 /* Memory flags in the memflags field of a struct res_resource.  */
 
 #define MEMFLAG_MOVEABLE       0x10