Browse Source

* revert isatty patch

peter 21 years ago
parent
commit
b3b9b245e1
3 changed files with 9 additions and 9 deletions
  1. 3 3
      ide/fpdebug.pas
  2. 3 3
      ide/fpusrscr.pas
  3. 3 3
      rtl/freebsd/console.pp

+ 3 - 3
ide/fpdebug.pas

@@ -774,7 +774,7 @@ begin
       Assign(Debuggeefile,DebuggeeTTY);
       Assign(Debuggeefile,DebuggeeTTY);
       system.Reset(Debuggeefile);
       system.Reset(Debuggeefile);
       ResetOK:=IOResult=0;
       ResetOK:=IOResult=0;
-      If ResetOK and IsATTY(textrec(Debuggeefile).handle) then
+      If ResetOK and {$ifdef ver1_0}IsATTY(textrec(Debuggeefile).handle){$else}(IsATTY(textrec(Debuggeefile).handle)<>-1){$endif} then
         begin
         begin
           Command('tty '+DebuggeeTTY);
           Command('tty '+DebuggeeTTY);
           TTYUsed:=true;
           TTYUsed:=true;
@@ -3603,8 +3603,8 @@ end.
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.50  2004-07-09 20:23:31  daniel
-    * Fix compilation
+  Revision 1.51  2004-07-09 23:17:25  peter
+    * revert isatty patch
 
 
   Revision 1.49  2004/02/20 21:46:06  peter
   Revision 1.49  2004/02/20 21:46:06  peter
     * fix compile with 1.0.x
     * fix compile with 1.0.x

+ 3 - 3
ide/fpusrscr.pas

@@ -774,7 +774,7 @@ begin
   TTYFd:=-1;
   TTYFd:=-1;
   IsXterm:=getenv('TERM')='xterm';
   IsXterm:=getenv('TERM')='xterm';
   ThisTTY:=TTYName(stdinputhandle);
   ThisTTY:=TTYName(stdinputhandle);
-  if Not IsXterm and IsATTY(stdinputhandle) then
+  if Not IsXterm and {$ifdef ver1_0}IsATTY(stdinputhandle){$else}(IsATTY(stdinputhandle)<>-1){$endif} then
     begin
     begin
       Console:=TTyNetwork;  {Default: Network or other vtxxx tty}
       Console:=TTyNetwork;  {Default: Network or other vtxxx tty}
       if (Copy(ThisTTY, 1, 8) = '/dev/tty') and (ThisTTY[9]<>'p') Then
       if (Copy(ThisTTY, 1, 8) = '/dev/tty') and (ThisTTY[9]<>'p') Then
@@ -1449,8 +1449,8 @@ end;
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.33  2004-07-09 20:23:31  daniel
-    * Fix compilation
+  Revision 1.34  2004-07-09 23:17:26  peter
+    * revert isatty patch
 
 
   Revision 1.32  2004/02/20 21:46:06  peter
   Revision 1.32  2004/02/20 21:46:06  peter
     * fix compile with 1.0.x
     * fix compile with 1.0.x

+ 3 - 3
rtl/freebsd/console.pp

@@ -1830,7 +1830,7 @@ function physicalconsole(fd:longint) : boolean;
 var name:string;
 var name:string;
 
 
 begin
 begin
- if isatty(fd) then
+ if (isatty(fd)<>-1) then
   begin
   begin
    name:=ttyname(fd);
    name:=ttyname(fd);
    if Copy(name,1,8)<>'/dev/tty' then
    if Copy(name,1,8)<>'/dev/tty' then
@@ -3476,8 +3476,8 @@ end.
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.9  2004-07-09 20:21:20  daniel
-    * Fix compilation for now
+  Revision 1.10  2004-07-09 23:18:16  peter
+    * revert isatty patch
 
 
   Revision 1.8  2004/01/03 12:18:29  marco
   Revision 1.8  2004/01/03 12:18:29  marco
    * a lot of copyright notices and CVS logs added and fixed
    * a lot of copyright notices and CVS logs added and fixed