+ Removed ver1_0 define

git-svn-id: trunk@237 -

fcl/darwin/syncobjs.pp

@@ -19,11 +19,7 @@ interface
 
 uses
   pthreads,
-{$ifdef ver1_0}
-  Linux,
-{$else}
   unix,
-{$endif}
   sysutils;
 
 type

fcl/db/db.pp

@@ -34,10 +34,6 @@ const
 
 
 type
-{$ifdef ver1_0}
-  PtrInt = Longint;
-  PPtrInt = ^PtrInt;
-{$endif}
 
 {LargeInt}
   LargeInt = Int64;

fcl/freebsd/syncobjs.pp

@@ -19,11 +19,7 @@ interface
 
 uses
   pthreads,
-{$ifdef ver1_0}
-  Linux,
-{$else}
   unix,
-{$endif}
   sysutils;
 
 type

fcl/image/pscanvas.pp

@@ -214,17 +214,6 @@ Resourcestring
   SErrNoStreamAssigned = 'Invalid operation: No stream assigned';
   SErrDocumentAlreadyStarted = 'Cannot start document twice.';
 
-{$ifdef ver1_0}
-const   lineending=#10;
-
-procedure freeandnil(var o:Tobject);
-
-begin
-  o.destroy;
-  o:=nil;
-end;
-
-{$endif}
 
 { TPostScriptCanvas ----------------------------------------------------------}
 

fcl/inc/ssockets.pp

@@ -136,8 +136,8 @@ type
   Protected
     Procedure DoConnect(ASocket : longint); Virtual;
   Public
-    Constructor Create(ASocket : longint); Override; {$ifndef ver1_0}Overload;{$endif}
-    Constructor Create(const AHost: String; APort: Word); {$ifndef ver1_0}Overload;{$endif}
+    Constructor Create(ASocket : longint); Override; Overload;
+    Constructor Create(const AHost: String; APort: Word); Overload;
     Property Host : String Read FHost;
     Property Port : Word Read FPort;
   end;
@@ -150,8 +150,8 @@ type
   Protected
     Procedure DoConnect(ASocket : longint); Virtual;
   Public
-    Constructor Create(ASocket : Longint); {$ifndef ver1_0}Overload;{$endif}
-    Constructor Create(AFileName : String); {$ifndef ver1_0}Overload;{$endif}
+    Constructor Create(ASocket : Longint); Overload;
+    Constructor Create(AFileName : String); Overload;
     Property FileName : String Read FFileName;
   end;
 {$endif}
@@ -160,12 +160,8 @@ Implementation
 
 uses
 {$ifdef unix}
-  {$ifdef ver1_0}
-    Linux,
-  {$else}
-    BaseUnix, Unix,
-  {$endif}
- {$endif}
+  BaseUnix, Unix,
+{$endif}
   resolve;
 
 Const
@@ -386,7 +382,7 @@ Procedure TSocketServer.SetNonBlocking;
 
 begin
 {$ifdef Unix}
-  {$ifdef ver1_0}fcntl{$else}fpfcntl{$endif}(FSocket,F_SETFL,{$ifdef ver1_0}OPEN_NONBLOCK{$else}O_NONBLOCK{$endif});
+  fpfcntl(FSocket,F_SETFL,O_NONBLOCK);
 {$endif}
   FNonBlocking:=True;
 end;
@@ -437,7 +433,7 @@ begin
   Result:=Sockets.Accept(Socket,Faddr,L);
   If Result<0 then
 {$ifdef Unix}
-    If SocketError={$ifdef ver1_0}Sys_EWOULDBLOCK{$else}ESysEWOULDBLOCK{$endif} then
+    If SocketError=ESysEWOULDBLOCK then
       Raise ESocketError.Create(seAcceptWouldBlock,[socket])
     else
 {$endif}
@@ -487,7 +483,7 @@ begin
   L:=Length(FFileName);
   Result:=Sockets.Accept(Socket,FUnixAddr,L);
   If Result<0 then
-    If SocketError={$ifdef ver1_0}Sys_EWOULDBLOCK{$else}ESysEWOULDBLOCK{$endif} then
+    If SocketError=ESysEWOULDBLOCK then
       Raise ESocketError.Create(seAcceptWouldBlock,[socket])
     else
       Raise ESocketError.Create(seAcceptFailed,[socket,SocketError]);

fcl/linux/syncobjs.pp

@@ -19,11 +19,7 @@ interface
 
 uses
   pthreads,
-{$ifdef ver1_0}
-  Linux,
-{$else}
   unix,
-{$endif}
   sysutils;
 
 type

fcl/unix/asyncioh.inc

@@ -12,11 +12,7 @@
  **********************************************************************}
 
 uses
-{$ifdef ver1_0}
-  Linux,
-{$else}
   Unix,
-{$endif}
   classes;
 
 const

fcl/unix/ezcgi.inc

@@ -13,12 +13,7 @@
 
 
 Uses
-{$ifdef ver1_0}
-  Linux
-{$else}
-  baseUnix
-{$endif}
-  ;
+  baseUnix;
 
 { Declared EXPLICITLY with Ansistring, so NO mistaking is possible }
 
@@ -28,7 +23,7 @@ Var P : Pchar;
 
 begin
    // Linux version returns pchar.
-   p:={$ifdef ver1_0}Linux.getenv{$else}BaseUnix.fpgetenv{$endif}(EnvVar);
+   p:=BaseUnix.fpgetenv(EnvVar);
    if P<>nil then
      getenv:=strpas(p)
    else

fcl/unix/pipes.inc

@@ -14,20 +14,12 @@
  **********************************************************************}
 
 Uses
-{$ifdef ver1_0}
-  Linux
-{$else}
   Unix
-{$endif}
   ;
 
 Function CreatePipeHandles (Var Inhandle,OutHandle : Longint) : Boolean;
 
 begin
-{$ifdef ver1_0}
-  Result := AssignPipe (Inhandle,OutHandle);
-{$else}
   Result := (AssignPipe (Inhandle,OutHandle)<>-1);
-{$endif}
 end;
 

fcl/unix/process.inc

@@ -3,12 +3,8 @@
 }
 
 uses
-{$ifdef ver1_0}
-   Linux;
-{$else}
    Unix,
    Baseunix;
-{$endif}
 
 
 
@@ -21,51 +17,6 @@ Const
   TitleOption : String ='-title';
 
 
-{$ifdef ver1_0}
-// Compatibility functions.
-// Change to function, check results..
-procedure fpDup2(H1,H2 : Longint);
-
-begin
-  dup2(H1,H2)
-end;
-
-function fpFork : Longint;
-
-begin
-end;
-
-function fpGetEnv(S : String) : PChar;
-
-begin
-  Result:=GetEnv(S : String);
-end;
-
-Procedure fpExecve(S : PChar; A,E : PPChar);
-
-begin
-  ExecVE(S,A,E);
-end;
-
-Procedure fpExecv(S : PChar; A : PPChar);
-
-begin
-  ExecVE(S,A);
-end;
-
-Function fpWaitPID(H: Longint; P : Pointer; Opts : Longint) : Integer;
-
-begin
-  Result:=WaitPID(Handle,@FExitCode,Opts);
-end;
-
-Function fpKill(PID,SIG : Longint) : Longint;
-
-begin
-  Result:=kill(Handle,SIGTERM)=0;
-end;
-{$endif}
-
 
 procedure TProcess.CloseProcessHandles;
 

fcl/xml/dom.pp

@@ -67,13 +67,8 @@ type
 //   DOMString
 // -------------------------------------------------------
 
-{$IFDEF ver1_0}
-  DOMString = String;
-  DOMPChar = PChar;
-{$ELSE}
   DOMString = WideString;
   DOMPChar = PWideChar;
-{$ENDIF}
 
 
 // -------------------------------------------------------