* fix netware double define bug

* refactoring of lhttputil

git-svn-id: trunk@5373 -

fcl/lnet/lcommon.pp

@@ -50,12 +50,6 @@ const
   SOCKET_ERROR = WinSock.SOCKET_ERROR;
   {$ENDIF}
 
-  {$IFDEF NETWLIBC}
-  SOL_SOCKET = WinSock.SOL_SOCKET;
-  LMSG = 0;
-  SOCKET_ERROR = WinSock.SOCKET_ERROR;
-  {$ENDIF}
-
   {$IFDEF UNIX}
   INVALID_SOCKET = -1;
   SOCKET_ERROR = -1;

fcl/lnet/lhttputil.pp

@@ -40,16 +40,16 @@ const
 type
   PSearchRec = ^TSearchRec;
 
-function GMTToLocalTime(ADateTime: TDateTime): TDateTime;
-function LocalTimeToGMT(ADateTime: TDateTime): TDateTime;
-function TryHTTPDateStrToDateTime(ADateStr: pchar; var ADest: TDateTime): boolean;
-
-function SeparatePath(var InPath: string; out ExtraPath: string; const Mode:Longint;
-  ASearchRec: PSearchRec = nil): boolean;
-function CheckPermission(const ADocument: pchar): boolean;
-function HTTPDecode(AStr: pchar): pchar;
-function HTTPEncode(const AStr: string): string;
-function HexToNum(AChar: char): byte;
+  function GMTToLocalTime(ADateTime: TDateTime): TDateTime;
+  function LocalTimeToGMT(ADateTime: TDateTime): TDateTime;
+  function TryHTTPDateStrToDateTime(ADateStr: pchar; var ADest: TDateTime): boolean;
+
+  function SeparatePath(var InPath: string; out ExtraPath: string; const Mode:Longint;
+    ASearchRec: PSearchRec = nil): boolean;
+  function CheckPermission(const ADocument: pchar): boolean;
+  function HTTPDecode(AStr: pchar): pchar;
+  function HTTPEncode(const AStr: string): string;
+  function HexToNum(AChar: char): byte;
 
 implementation
 

fcl/lnet/sys/osunits.inc

@@ -14,9 +14,5 @@
   WinSock,
 {$endif}
 
-{$ifdef NETWLIBC}
-  WinSock,
-{$endif}
-
   SysUtils, Sockets;