summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-11-21 16:03:36 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-11-21 16:03:36 +0000
commit1ef2b73b79127c5a4d74e0ec3f144eebb3652700 (patch)
tree44c095e534bb1c6a8e330a3b0921a644c02b162a
parent6f0bc5c17885f4efd88920a7f9c705a9c1534918 (diff)
downloadrockbox-1ef2b73b79127c5a4d74e0ec3f144eebb3652700.zip
rockbox-1ef2b73b79127c5a4d74e0ec3f144eebb3652700.tar.gz
rockbox-1ef2b73b79127c5a4d74e0ec3f144eebb3652700.tar.bz2
rockbox-1ef2b73b79127c5a4d74e0ec3f144eebb3652700.tar.xz
nuked gcc4 warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8025 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--tools/sh2d.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/sh2d.c b/tools/sh2d.c
index 5e2241d..aee69d3 100644
--- a/tools/sh2d.c
+++ b/tools/sh2d.c
@@ -30,7 +30,7 @@
typedef struct
{
int format;
- unsigned char *mnem;
+ const char *mnem;
unsigned short mask; /* mask used to obtain opcode bits */
unsigned short bits; /* opcode bits */
int dat; /* specific data for situation */
@@ -541,7 +541,7 @@ int main(int argc, char **argv)
fseek(fp, 0, SEEK_END);
fsize = ftell(fp);
rewind(fp);
- if ((buffer = (unsigned char *) calloc(fsize * 2, sizeof(unsigned short)))
+ if ((buffer = (char *) calloc(fsize * 2, sizeof(unsigned short)))
== NULL)
{
fprintf(stderr, "sh2d: Not enough memory to load input "
@@ -560,11 +560,11 @@ int main(int argc, char **argv)
{
if (do_org)
{
- SH2Disasm(org, &buffer[i], mode, &mark[i]);
+ SH2Disasm(org, (unsigned char*)&buffer[i], mode, &mark[i]);
org += 2;
}
else
- SH2Disasm(i, &buffer[i], mode, &mark[i]);
+ SH2Disasm(i, (unsigned char *)&buffer[i], mode, &mark[i]);
j += 2;
}