aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2002-04-09 16:55:48 +0000
committerNick Clifton <nickc@redhat.com>2002-04-09 16:55:48 +0000
commitf7d63484de877e1d0efe47ed768eb893332e5c5d (patch)
tree959d06f9e83eb1a6932b6110d802595120bd0492 /binutils
parent5bcd00a60aef50165fe80e709b9ddfaea87ffaaa (diff)
downloadgdb-f7d63484de877e1d0efe47ed768eb893332e5c5d.zip
gdb-f7d63484de877e1d0efe47ed768eb893332e5c5d.tar.gz
gdb-f7d63484de877e1d0efe47ed768eb893332e5c5d.tar.bz2
Set default LANGUAGE to english/us.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog4
-rw-r--r--binutils/testsuite/ChangeLog8
-rw-r--r--binutils/testsuite/binutils-all/windres/deflang.rc4
-rw-r--r--binutils/testsuite/binutils-all/windres/deflang.rsd8
-rw-r--r--binutils/testsuite/binutils-all/windres/dialogsignature.rsd2
-rw-r--r--binutils/testsuite/binutils-all/windres/escapea.rsd2
-rw-r--r--binutils/testsuite/binutils-all/windres/escapex.rsd2
-rw-r--r--binutils/testsuite/binutils-all/windres/printstyle.rsd2
-rw-r--r--binutils/windres.c7
9 files changed, 33 insertions, 6 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 8613965..ecbd2ac 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -12,7 +12,9 @@
* resrc.c: Print style even if it is 0.
* resbin.c: Use signature to identify DIALOGEX.
-
+
+ * windres.c: Set default LANGUAGE to english/us.
+
2002-04-09 Gunnar Degnbol <degnbol@danbbs.dk>
* resrc.c: print CLASS names in quotes
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 9129b6e..033935a 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,5 +1,13 @@
2002-04-09 Nick Clifton <nickc@cambridge.redhat.com>
+ * binutils-all/windres/deflang.rc: New test case: Check default
+ language.
+ * binutils-all/windres/deflang.rsd: Expected output.
+
+ * binutils-all/windres/dialogsignature.rc: New test case for
+ decoding the dialog signature.
+ * binutils-all/windres/dialogsignature.rsd: Expected output.
+
* binutils-all/windres/escapea.rc: New test case for encoding \a
escape sequence.
* binutils-all/windres/escapea.rsd: Expected output.
diff --git a/binutils/testsuite/binutils-all/windres/deflang.rc b/binutils/testsuite/binutils-all/windres/deflang.rc
new file mode 100644
index 0000000..1f3c20f
--- /dev/null
+++ b/binutils/testsuite/binutils-all/windres/deflang.rc
@@ -0,0 +1,4 @@
+101 DIALOG DISCARDABLE 0, 0, 186, 95
+BEGIN
+ DEFPUSHBUTTON "OK",1,129,7,50,14
+END
diff --git a/binutils/testsuite/binutils-all/windres/deflang.rsd b/binutils/testsuite/binutils-all/windres/deflang.rsd
new file mode 100644
index 0000000..36b68c2
--- /dev/null
+++ b/binutils/testsuite/binutils-all/windres/deflang.rsd
@@ -0,0 +1,8 @@
+ 0000 00000000 20000000 ffff0000 ffff0000 .... ...........
+ 0010 00000000 00000000 00000000 00000000 ................
+ 0020 36000000 20000000 ffff0500 ffff6500 6... .........e.
+ 0030 00000000 10100904 00000000 00000000 ................
+ 0040 00008880 00000000 01000000 0000ba00 ................
+ 0050 5f000000 00000000 01000150 00000000 _..........P....
+ 0060 81000700 32000e00 0100ffff 80004f00 ....2.........O.
+ 0070 4b000000 00000000 K.......
diff --git a/binutils/testsuite/binutils-all/windres/dialogsignature.rsd b/binutils/testsuite/binutils-all/windres/dialogsignature.rsd
index fbe7790..9a44b82 100644
--- a/binutils/testsuite/binutils-all/windres/dialogsignature.rsd
+++ b/binutils/testsuite/binutils-all/windres/dialogsignature.rsd
@@ -1,7 +1,7 @@
0000 00000000 20000000 ffff0000 ffff0000 .... ...........
0010 00000000 00000000 00000000 00000000 ................
0020 36000000 20000000 ffff0500 ffff6500 6... .........e.
- 0030 00000000 10100000 00000000 00000000 ................
+ 0030 00000000 10100904 00000000 00000000 ................
0040 01000000 00000000 01000000 0000ba00 ................
0050 5f000000 00000000 01000150 00000000 _..........P....
0060 81000700 32000e00 0100ffff 80004f00 ....2.........O.
diff --git a/binutils/testsuite/binutils-all/windres/escapea.rsd b/binutils/testsuite/binutils-all/windres/escapea.rsd
index 1875ebe..aff0928 100644
--- a/binutils/testsuite/binutils-all/windres/escapea.rsd
+++ b/binutils/testsuite/binutils-all/windres/escapea.rsd
@@ -1,7 +1,7 @@
0000 00000000 20000000 ffff0000 ffff0000 .... ...........
0010 00000000 00000000 00000000 00000000 ................
0020 28000000 20000000 ffff0400 ffff1400 (... ...........
- 0030 00000000 10100000 00000000 00000000 ................
+ 0030 00000000 10100904 00000000 00000000 ................
0040 00000000 90002600 46006900 6c006500 ......&.F.i.l.e.
0050 00008000 11002600 4f007000 65006e00 ......&.O.p.e.n.
0060 08005e00 4f000000 ..^.O...
diff --git a/binutils/testsuite/binutils-all/windres/escapex.rsd b/binutils/testsuite/binutils-all/windres/escapex.rsd
index 9165342..182007c 100644
--- a/binutils/testsuite/binutils-all/windres/escapex.rsd
+++ b/binutils/testsuite/binutils-all/windres/escapex.rsd
@@ -1,7 +1,7 @@
0000 00000000 20000000 ffff0000 ffff0000 .... ...........
0010 00000000 00000000 00000000 00000000 ................
0020 34000000 20000000 ffff0500 ffff6500 4... .........e.
- 0030 00000000 10100000 00000000 00000000 ................
+ 0030 00000000 10100904 00000000 00000000 ................
0040 00008880 00000000 01000000 0000ba00 ................
0050 5f000000 00000000 00000250 00000000 _..........P....
0060 17002e00 1c000800 ffffffff 8200b000 ................
diff --git a/binutils/testsuite/binutils-all/windres/printstyle.rsd b/binutils/testsuite/binutils-all/windres/printstyle.rsd
index df203cb..a44adda 100644
--- a/binutils/testsuite/binutils-all/windres/printstyle.rsd
+++ b/binutils/testsuite/binutils-all/windres/printstyle.rsd
@@ -1,7 +1,7 @@
0000 00000000 20000000 ffff0000 ffff0000 .... ...........
0010 00000000 00000000 00000000 00000000 ................
0020 36000000 20000000 ffff0500 ffff6500 6... .........e.
- 0030 00000000 10100000 00000000 00000000 ................
+ 0030 00000000 10100904 00000000 00000000 ................
0040 00000000 00000000 01000000 0000ba00 ................
0050 5f000000 00000000 01000150 00000000 _..........P....
0060 81000700 32000e00 0100ffff 80004f00 ....2.........O.
diff --git a/binutils/windres.c b/binutils/windres.c
index 0b56bc2..1548353 100644
--- a/binutils/windres.c
+++ b/binutils/windres.c
@@ -145,6 +145,8 @@ static enum res_format format_from_filename PARAMS ((const char *, int));
static void usage PARAMS ((FILE *, int));
static int cmp_res_entry PARAMS ((const PTR, const PTR));
static struct res_directory *sort_resources PARAMS ((struct res_directory *));
+static void reswr_init PARAMS ((void));
+static const char * quot PARAMS ((const char *));
/* When we are building a resource tree, we allocate everything onto
an obstack, so that we can free it all at once if we want. */
@@ -765,6 +767,9 @@ quot (string)
return buf;
}
+/* This keeps gcc happy when using -Wmissing-prototypes -Wstrict-prototypes. */
+int main PARAMS ((int, char **));
+
/* The main function. */
int
@@ -809,7 +814,7 @@ main (argc, argv)
target = NULL;
preprocessor = NULL;
preprocargs = NULL;
- language = -1;
+ language = 0x409; /* LANG_ENGLISH, SUBLANG_ENGLISH_US. */
use_temp_file = 0;
while ((c = getopt_long (argc, argv, "i:o:I:O:F:D:hHvV", long_options,