Merged revisions 1310 via svnmerge from

/trunk

git-svn-id: branches/fixes_2_0@1311 -

rtl/unix/ttyname.inc

@@ -71,7 +71,7 @@ var
 
 begin
   TTYName:='';
-  if (fpfstat(handle,st)=-1) and (isatty (handle)<>1) then
+  if (fpfstat(handle,st)=-1) or (isatty (handle)<>1) then
    exit;
   mydev:=st.st_dev;
   myino:=st.st_ino;