Selaa lähdekoodia

* merged fixes

peter 24 vuotta sitten
vanhempi
commit
9b38d0fadb
3 muutettua tiedostoa jossa 17 lisäystä ja 6 poistoa
  1. 5 1
      rtl/unix/linux.pp
  2. 7 4
      rtl/unix/mouse.pp
  3. 5 1
      rtl/unix/unix.pp

+ 5 - 1
rtl/unix/linux.pp

@@ -1339,6 +1339,7 @@ Function OpenDir(F:String):PDir;
 begin
   F:=F+#0;
   OpenDir:=OpenDir(@F[1]);
+  LinuxError:=ErrNo;
 end;
 
 
@@ -2956,7 +2957,10 @@ End.
 
 {
   $Log$
-  Revision 1.15  2001-08-12 18:08:59  peter
+  Revision 1.16  2001-09-17 21:36:31  peter
+    * merged fixes
+
+  Revision 1.15  2001/08/12 18:08:59  peter
     * Range check fix with epoch (merged)
 
   Revision 1.14  2001/07/16 20:27:30  marco

+ 7 - 4
rtl/unix/mouse.pp

@@ -30,9 +30,9 @@ implementation
 
 uses
   Unix,Video
-{$ifndef NOMOUSE}
+{$ifndef NOGPM}
   ,gpm
-{$endif ndef NOMOUSE}
+{$endif ndef NOGPM}
   ;
 
 const
@@ -82,11 +82,11 @@ var
 {$endif ndef NOGPM}
 begin
 {$ifndef NOMOUSE}
-{$ifndef NOGPM}
   PendingMouseHead:=@PendingMouseEvent;
   PendingMouseTail:=@PendingMouseEvent;
   PendingMouseEvents:=0;
   FillChar(LastMouseEvent,sizeof(TMouseEvent),0);
+{$ifndef NOGPM}
   if gpm_fs=-1 then
     begin
     { open gpm }
@@ -405,7 +405,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.3  2001-08-05 12:24:20  peter
+  Revision 1.4  2001-09-17 21:36:31  peter
+    * merged fixes
+
+  Revision 1.3  2001/08/05 12:24:20  peter
     * m68k merges
 
   Revision 1.2  2001/01/21 20:21:40  marco

+ 5 - 1
rtl/unix/unix.pp

@@ -1323,6 +1323,7 @@ Function OpenDir(F:String):PDir;
 begin
   F:=F+#0;
   OpenDir:=OpenDir(@F[1]);
+  LinuxError:=ErrNo;
 end;
 
 
@@ -2933,7 +2934,10 @@ End.
 
 {
   $Log$
-  Revision 1.15  2001-08-12 18:05:19  peter
+  Revision 1.16  2001-09-17 21:36:31  peter
+    * merged fixes
+
+  Revision 1.15  2001/08/12 18:05:19  peter
     * Range check fix with epoch (merged)
 
   Revision 1.14  2001/07/12 12:42:39  marco