* disable inline for 1.9.4

rtl/inc/sockets.inc

@@ -173,7 +173,7 @@ end;
 
 type thostaddr= packed array[1..4] of byte;
 
-function htonl( host : longint):longint; {$ifndef VER1_0} inline; {$ENDIF}
+function htonl( host : longint):longint; {$ifdef HASINLINE} inline; {$ENDIF}
 
 begin
 {$ifdef FPC_BIG_ENDIAN}
@@ -186,7 +186,7 @@ begin
 {$endif}
 end;
 
-Function NToHl (Net : Longint) : Longint;  {$ifndef VER1_0} inline; {$ENDIF}
+Function NToHl (Net : Longint) : Longint;  {$ifdef HASINLINE} inline; {$ENDIF}
 
 begin
 {$ifdef FPC_BIG_ENDIAN}
@@ -199,7 +199,7 @@ begin
 {$endif}
 end;
 
-function htons( host : word):word; {$ifndef VER1_0} inline; {$ENDIF}
+function htons( host : word):word; {$ifdef HASINLINE} inline; {$ENDIF}
 
 begin
 {$ifdef FPC_BIG_ENDIAN}
@@ -209,7 +209,7 @@ begin
 {$endif}
 end;
 
-Function NToHs (Net : word):word;{$ifndef VER1_0} inline; {$ENDIF}
+Function NToHs (Net : word):word;{$ifdef HASINLINE} inline; {$ENDIF}
 
 begin
 {$ifdef FPC_BIG_ENDIAN}
@@ -221,7 +221,10 @@ end;
 
 {
   $Log$
-  Revision 1.13  2004-11-01 17:29:47  marco
+  Revision 1.14  2004-11-01 19:39:19  peter
+    * disable inline for 1.9.4
+
+  Revision 1.13  2004/11/01 17:29:47  marco
    * inline problems fixed
 
   Revision 1.12  2004/11/01 16:23:15  marco

rtl/inc/socketsh.inc

@@ -13,7 +13,10 @@
  **********************************************************************}
 
 {$IFNDEF ver1_0}
-  {$INLINE ON}
+  {$IFNDEF ver1_9_4}
+    {$INLINE ON}
+    {$define HASINLINE}
+  {$endif}  
 {$ENDIF}
 
 {$ifdef FreeBSD}
@@ -187,14 +190,17 @@ Function Accept(Sock:longint;var addr:TInetSockAddr;var SockIn,SockOut:text):Boo
 Function Connect(Sock:longint;const addr:TInetSockAddr;var SockIn,SockOut:text):Boolean;
 Function Connect(Sock:longint;const addr:TInetSockAddr;var SockIn,SockOut:file):Boolean;
 
-function htonl( host : longint):longint;  {$ifndef ver1_0} inline; {$endif}
-Function NToHl (Net : Longint) : Longint; {$ifndef ver1_0} inline; {$endif}
-function htons( host : word):word;	  {$ifndef ver1_0} inline; {$endif}
-Function NToHs (Net : word):word;         {$ifndef ver1_0} inline; {$endif}
+function htonl( host : longint):longint;  {$ifdef HASINLINE} inline; {$endif}
+Function NToHl (Net : Longint) : Longint; {$ifdef HASINLINE} inline; {$endif}
+function htons( host : word):word;	  {$ifdef HASINLINE} inline; {$endif}
+Function NToHs (Net : word):word;         {$ifdef HASINLINE} inline; {$endif}
 
 {
   $Log$
-  Revision 1.17  2004-11-01 17:35:22  marco
+  Revision 1.18  2004-11-01 19:39:19  peter
+    * disable inline for 1.9.4
+
+  Revision 1.17  2004/11/01 17:35:22  marco
    * typo fixed, aarght
 
   Revision 1.16  2004/11/01 17:29:47  marco