From f8e7d0888552dac2546b4434a65fff9feff24f79 Mon Sep 17 00:00:00 2001 From: celestar Date: Mon, 5 Mar 2007 09:35:45 +0000 Subject: [PATCH] (svn r9016) [SunOS] -Fix: Don't use a struct-member that doesn't exist. -Documentation: Updated readme.txt for SunOS 5.10 (aka Solaris 10) Note: With this commit, building and running on Solaris 10 works, thus we officially support this OS now :) --- readme.txt | 8 ++++++++ src/network/network.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index d024a1ed3b..c5aa945e08 100644 --- a/readme.txt +++ b/readme.txt @@ -146,6 +146,14 @@ Windows: You can also build it using the Makefile with MSYS/MinGW or Cygwin/MinGW. Please read the Makefile for more information. +Solaris 10: + You need g++ (version 3 or higher), together with SDL. Installation of + libpng and zlib is recommended. For the first build it is required + to execute "bash configure" first. Note that ./configure does not work + yet. It is likely that you don't have a strip binary, so use the + --disable-strip option in that case. Fontconfig (>2.3.0) and freetype + are optional. "make run" will then run the program. + Unix: OpenTTD can be built with GNU "make". On non-GNU systems it's called "gmake". However, for the first build one has to do a "./configure" first. diff --git a/src/network/network.cpp b/src/network/network.cpp index c523623ce1..7c7aa9a3a7 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -491,7 +491,7 @@ static void NetworkFindIPs(void) } p += sizeof(struct ifreq); -#ifdef AF_LINK +#if defined(AF_LINK) && !defined(SUNOS) p += req->ifr_addr.sa_len - sizeof(struct sockaddr); #endif }