morphos: fixed fcl-net and rtl-extra builds

git-svn-id: trunk@33605 -

packages/fcl-net/src/amiga/resolve.inc

@@ -46,8 +46,8 @@ Type
   end;
   PServEntry = ^TServEnt;
 
-{ C style calls, linked in from Libc }
-{$ifdef AMIGA68k}
+{ remember, classic style calls are also used on MorphOS, so don't test for AMIGA68K }
+{$ifndef AMIGAOS4}
 function gethostbyname(Name: PChar location 'a0'): PHostEntry; syscall SocketBase 210;
 function getnetbyname(Name: PChar location 'a0'): PNetEntry; syscall SocketBase 222;
 function getnetbyaddr(Net: Longint location 'd0'; NetType: Longint location 'd1'): PNetEntry; syscall SocketBase 228;
@@ -60,9 +60,9 @@ function getnetent: PNetEntry; syscall SocketBase 528;
 procedure setservent(StayOpen: longint location 'd0'); syscall SocketBase 552;
 procedure endservent; syscall SocketBase 558;
 function getservent: PServEntry; syscall SocketBase 564;
-{$endif}
 
-{$ifdef AMIGAOS4}
+{$else AMIGAOS4}
+
 function gethostbyname(const Name: PChar): PHostEntry; syscall ISocket 196;
 function getnetbyname(Name: PChar): PNetEntry; syscall ISocket 204;
 function getnetbyaddr(Net: Longint; NetType: Longint): PNetEntry; syscall ISocket 208;
@@ -75,7 +75,7 @@ function getnetent: PNetEntry; syscall ISocket 464;
 procedure setservent(StayOpen: longint); syscall ISocket 480;
 procedure endservent; syscall ISocket 484;
 function getservent: PServEntry; syscall ISocket 488;
-{$endif}
+{$endif AMIGAOS4}
 
 function gethostbyaddr(Addr: PChar; Len: Longint; HType: Longint): PHostentry;
 var

packages/rtl-extra/src/amiga/sockets.pp

@@ -109,7 +109,9 @@ Function Accept(Sock:longint;var addr:string;var SockIn,SockOut:File):Boolean;
 //function  fpaccept      (s:cint; addrx : psockaddr; addrlen : psocklen):cint; maybelibc
 //function  fpbind      (s:cint; addrx : psockaddr; addrlen : tsocklen):cint;  maybelibc
 //function  fpconnect     (s:cint; name  : psockaddr; namelen : tsocklen):cint;  maybelibc
-{$ifdef AMIGA68k}
+
+{ remember, classic style calls are also compiled for MorphOS, so don't test against AMIGA68K }
+{$ifndef AMIGAOS4}
 threadvar
   SocketBase: PLibrary;
 
@@ -138,9 +140,9 @@ function bsd_gethostbyaddr(const Addr: PByte location 'a0'; Len: LongInt locatio
 function ObtainSocket(id: LongInt location 'd0'; domain: LongInt location 'd1'; _type: LongInt location 'd2'; protocol: LongInt location 'd3'): LongInt; syscall SocketBase 144;
 function ReleaseSocket(s: LongInt location 'd0'; id: LongInt location 'd1'): LongInt; syscall SocketBase 150;
 function ReleaseCopyOfSocket(s: LongInt location 'd0'; id: LongInt location 'd1'): LongInt; syscall SocketBase 156;
-{$endif}
 
-{$ifdef AMIGAOS4}
+{$else AMIGAOS4}
+
 var
   SocketBase: PLibrary;
   ISocket: PInterface;
@@ -170,7 +172,7 @@ function bsd_gethostbyaddr(const Addr: PByte; Len: LongInt; Type_: LongInt): PHo
 function ObtainSocket(id: LongInt; domain: LongInt; _type: LongInt; protocol: LongInt): LongInt; syscall ISocket 152;
 function ReleaseSocket(s: LongInt; id: LongInt): LongInt; syscall ISocket 156;
 function ReleaseCopyOfSocket(s: LongInt; id: LongInt): LongInt; syscall ISocket 160;
-{$endif}
+{$endif AMIGAOS4}
 
 
 { Definition for Release(CopyOf)Socket unique id }