From d392f7043f9400f23f4530bb70b1b28087018a5e Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Sat, 26 Dec 2015 15:04:37 +0000
Subject: [PATCH] * Patch from Mark Morgan LLoyd to enable compilation for
 Solaris (bug ID 29223)

git-svn-id: trunk@32726 -
---
 packages/fcl-net/fpmake.pp     | 2 +-
 packages/fcl-net/src/cnetdb.pp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/fcl-net/fpmake.pp b/packages/fcl-net/fpmake.pp
index 63adc19cc8..fa9a73ee59 100644
--- a/packages/fcl-net/fpmake.pp
+++ b/packages/fcl-net/fpmake.pp
@@ -70,7 +70,7 @@ begin
         end;
     T.ResourceStrings := True;
 
-    T:=P.Targets.AddUnit('cnetdb.pp',[linux,freebsd]);
+    T:=P.Targets.AddUnit('cnetdb.pp',[linux,freebsd,solaris]);
 
     P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('examples/ip6test.pp');
diff --git a/packages/fcl-net/src/cnetdb.pp b/packages/fcl-net/src/cnetdb.pp
index 5637e6af2a..c49b7aef11 100644
--- a/packages/fcl-net/src/cnetdb.pp
+++ b/packages/fcl-net/src/cnetdb.pp
@@ -194,11 +194,11 @@ type
 {$if defined(LINUX) or defined(OPENBSD)}
 {$define FIRST_ADDR_THEN_CANONNAME}
 {$endif}
-{$if defined(FREEBSD) or defined(NETBSD) or defined(DRAGONFLY)}
+{$if defined(FREEBSD) or defined(NETBSD) or defined(DRAGONFLY) or defined(SOLARIS)}
 {$define FIRST_CANONNAME_THEN_ADDR}
 {$endif}
 {$if not defined(FIRST_CANONNAME_THEN_ADDR) and not defined(FIRST_ADDR_THEN_CANONNAME)}
-{$error fatal 'Please consult the netdh.h file for your system to determine the order of ai_addr and ai_canonname'}
+{$error fatal 'Please consult the netdb.h file for your system to determine the order of ai_addr and ai_canonname'}
 {$endif} 
 
   PAddrInfo = ^addrinfo;