(svn r9016) [SunOS] -Fix: Don't use a struct-member that doesn't exist.
authorcelestar
Mon, 05 Mar 2007 09:35:45 +0000
changeset 6545 8fbeb8254bf3
parent 6544 a5f64ee6e4d6
child 6546 d420506b08d8
(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
src/network/network.cpp
--- a/readme.txt	Mon Mar 05 05:03:28 2007 +0000
+++ b/readme.txt	Mon Mar 05 09:35:45 2007 +0000
@@ -146,6 +146,14 @@
   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.
--- a/src/network/network.cpp	Mon Mar 05 05:03:28 2007 +0000
+++ b/src/network/network.cpp	Mon Mar 05 09:35:45 2007 +0000
@@ -491,7 +491,7 @@
 		}
 
 		p += sizeof(struct ifreq);
-#ifdef AF_LINK
+#if defined(AF_LINK) && !defined(SUNOS)
 		p += req->ifr_addr.sa_len - sizeof(struct sockaddr);
 #endif
 	}