Opened 12 years ago

Closed 12 years ago

Last modified 12 months ago

#3557 closed defect (fixed)

SOLARIS: timidity.cpp won't because of missing macro

Reported by: SF/lblume Owned by: fingolfin
Priority: normal Component: Port: Solaris
Keywords: Cc:
Game:

Description

Using ScummVM 0.11.0 (svn checkout of the branch):

On Solaris, the system does not define the INADDR_NONE macro. This prevents timidity.cpp from building properly.

I added the macro in util.h, then everything built fine, and runs:

$ diff -u common/util.h.original common/util.h
--- common/util.h.original dim. janv. 13 01:09:35 2008
+++ common/util.h dim. janv. 13 12:28:32 2008
@@ -29,6 +29,10 @@
#include "common/str.h"
#include "common/array.h"

+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
+
#ifdef MIN
#undef MIN
#endif

Sorry for not being able to check before tagging, I was away for a few weeks. Anyway, itś a really minor build issue.

Ticket imported from: #1870304. Ticket imported from: bugs/3557.

Change History (4)

comment:1 by fingolfin, 12 years ago

Owner: set to fingolfin
Resolution: fixed
Status: newclosed
Summary: timidity.cpp won't build on Solaris because of missing macroSOLARIS: timidity.cpp won't because of missing macro

comment:2 by fingolfin, 12 years ago

A pity, so it won't be in 0.11.0. Will have to wait for 0.11.1.

Anyway, adding this to common/util.h is not an appropriate fix. The proper way to go would be to add that #ifndef sequence to timidity.cpp. I added a corresponding fix to the trunk and the 0.11.x branch, though.

comment:3 by digitall, 12 months ago

Component: Ports

comment:4 by digitall, 12 months ago

Component: PortsPort: Solaris
Note: See TracTickets for help on using tickets.