Opened 15 years ago

Closed 15 years ago

Last modified 11 months ago

#8336 closed patch

ScummVM tools 0.6.0 fixes when not using GCC

Reported by: SF/mrhandler Owned by: fingolfin
Priority: normal Component: Tools
Keywords: Cc:
Game:

Description

Hi!

During the build of ScummVM tools 0.6.0 with MIPSPro
C/C++ compilers on SGI IRIX, I've found some errors and
some incompabilities that I've fixed (see the attached
patch file).

The fixes are:
- md5table.c is a C file, but uses C++ constructs like
declaring variables in the middle of a function. GCC
may be tolerant on that, other compilers are not.

- in queenrebuild.c, there is a member structure
unintentional overwrite because an array is delclared
one byte shorter (this error has been caught directly
by the compiler)

- in simon2mp3.c, the public function end() has been
made static, because this function name is in conflict
with an internal name used by the IRIX linker.

Hope it helps,
Andrea

Ticket imported from: #924682. Ticket imported from: patches/441.

Attachments (1)

scummvm-tools-patches (1.4 KB ) - added by SF/mrhandler 15 years ago.
ScummVM tools 0.6.0 fixes (all platforms)

Download all attachments as: .zip

Change History (5)

by SF/mrhandler, 15 years ago

Attachment: scummvm-tools-patches added

ScummVM tools 0.6.0 fixes (all platforms)

comment:1 by fingolfin, 15 years ago

Component: --Unset--

comment:2 by fingolfin, 15 years ago

Owner: set to fingolfin
Status: newclosed

comment:3 by fingolfin, 15 years ago

The queenrebuild.c fix is in CVS now.

You might want to file a vendor bug report for the IRIX linker (internal
linker names should be prefixed by "__" according to the ISO C
standard). Anyway, i commited the change, as it causes no harm
elsewhere.

The md5table issue has already been fixed in HEAD CVS - another reason
to always make patches against HEAD CVS, and not release tar balls :-)

comment:4 by digitall, 11 months ago

Component: Tools
Note: See TracTickets for help on using tickets.