Quellcode durchsuchen

* move gpm.pp to linux

peter vor 20 Jahren
Ursprung
Commit
b28fd2f6b9
3 geänderte Dateien mit 13 neuen und 12 gelöschten Zeilen
  1. 1 2
      rtl/linux/Makefile
  2. 1 2
      rtl/linux/Makefile.fpc
  3. 11 8
      rtl/linux/gpm.pp

+ 1 - 2
rtl/linux/Makefile

@@ -2255,6 +2255,5 @@ terminfo$(PPUEXT) : terminfo.pp unix$(PPUEXT)
 callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT)
 cmem$(PPUEXT) : $(INC)/cmem.pp $(SYSTEMUNIT)$(PPUEXT)
 cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT) systhrds$(PPUEXT)
-gpm$(PPUEXT): $(UNIXINC)/gpm.pp unix$(PPUEXT) baseunix$(PPUEXT) sockets$(PPUEXT)
-	$(COMPILER) -Sg $(UNIXINC)/gpm.pp
+gpm$(PPUEXT): gpm.pp unix$(PPUEXT) baseunix$(PPUEXT) sockets$(PPUEXT)
 ctypes$(PPUEXT) :  $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT)

+ 1 - 2
rtl/linux/Makefile.fpc

@@ -289,7 +289,6 @@ cmem$(PPUEXT) : $(INC)/cmem.pp $(SYSTEMUNIT)$(PPUEXT)
 
 cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT) systhrds$(PPUEXT)
 
-gpm$(PPUEXT): $(UNIXINC)/gpm.pp unix$(PPUEXT) baseunix$(PPUEXT) sockets$(PPUEXT)
-        $(COMPILER) -Sg $(UNIXINC)/gpm.pp
+gpm$(PPUEXT): gpm.pp unix$(PPUEXT) baseunix$(PPUEXT) sockets$(PPUEXT)
 
 ctypes$(PPUEXT) :  $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT)

+ 11 - 8
rtl/unix/gpm.pp → rtl/linux/gpm.pp

@@ -332,14 +332,14 @@ begin
     gpm_get_console:='';
 end;
 
-procedure gpm_winch_hook(signum:longint);cdecl;
+procedure gpm_winch_hook(signum:longint;SigInfo: PSigInfo; SigContext: PSigContext);cdecl;
 
 var win:winsize;
 
 begin
-  if (signalhandler(SIG_IGN)<>gpm_saved_winch_hook.sa_handler) and
-     (signalhandler(SIG_DFL)<>gpm_saved_winch_hook.sa_handler) then
-    gpm_saved_winch_hook.sa_handler(signum);
+  if (sigactionhandler(SIG_IGN)<>gpm_saved_winch_hook.sa_handler) and
+     (sigactionhandler(SIG_DFL)<>gpm_saved_winch_hook.sa_handler) then
+    gpm_saved_winch_hook.sa_handler(signum,nil,nil);
   if fpioctl(gpm_consolefd,TIOCGWINSZ,@win)=-1 then
     exit;
   if (win.ws_col=0) or (win.ws_row=0) then
@@ -351,7 +351,7 @@ begin
   gpm_my:=win.ws_row - gpm_zerobased;
 end;
 
-procedure gpm_suspend_hook(signum:longint);cdecl;
+procedure gpm_suspend_hook(signum:longint;SigInfo: PSigInfo; SigContext: PSigContext);cdecl;
 
 var conn:Tgpmconnect;
     old_sigset,new_sigset:Tsigset;
@@ -566,11 +566,11 @@ begin
       if gpm_flag then
         begin
          { Install suspend hook }
-         sa.sa_handler:=signalhandler(SIG_IGN);
+         sa.sa_handler:=sigactionhandler(SIG_IGN);
          fpsigaction(SIGTSTP,@sa,@gpm_saved_suspend_hook);
 
          {if signal was originally ignored, job control is not supported}
-         if gpm_saved_suspend_hook.sa_handler<>signalhandler(SIG_IGN) then
+         if gpm_saved_suspend_hook.sa_handler<>sigactionhandler(SIG_IGN) then
            begin
             sa.sa_flags:=SA_NOMASK;
             sa.sa_handler:=@gpm_suspend_hook;
@@ -954,7 +954,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.14  2004-11-21 11:28:21  peter
+  Revision 1.4  2005-01-30 18:00:28  peter
+    * move gpm.pp to linux
+
+  Revision 1.14  2004/11/21 11:28:21  peter
     * fixed bootstrap with 1.0.10 and 1.9.4
 
   Revision 1.13  2004/11/06 20:06:19  peter