From f55bc9ffb044bb7c46da016c7107ebc9a291f571 Mon Sep 17 00:00:00 2001 From: mattias Date: Thu, 8 Dec 2005 11:47:51 +0000 Subject: [PATCH] replaced LinuxThreading with Unix, since it works now again with darwin git-svn-id: trunk@8278 - --- lcl/asyncprocess.pp | 6 ------ lcl/interfaces/gtk/gtkint.pp | 6 +----- lcl/interfaces/gtk/gtkobject.inc | 6 +++--- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/lcl/asyncprocess.pp b/lcl/asyncprocess.pp index e7f96d5296..2e589d388c 100644 --- a/lcl/asyncprocess.pp +++ b/lcl/asyncprocess.pp @@ -25,10 +25,6 @@ unit AsyncProcess; {$mode objfpc}{$H+} -{$IFDEF Linux} - {$DEFINE UseLinuxThreading} -{$ENDIF} - interface uses @@ -83,9 +79,7 @@ begin // FIONREAD -> bytes available for reading without blocking // FIONSPACE -> bytes available for writing without blocking // does not work on all platforms (not defined on linux e.g.) - {$ifdef UseLinuxThreading} if fpioctl(Output.Handle, FIONREAD, @Result) = -1 then - {$ENDIF} Result := 0; end; end; diff --git a/lcl/interfaces/gtk/gtkint.pp b/lcl/interfaces/gtk/gtkint.pp index a4e40e74d0..7bc76c70fe 100644 --- a/lcl/interfaces/gtk/gtkint.pp +++ b/lcl/interfaces/gtk/gtkint.pp @@ -50,10 +50,6 @@ interface {off $Define Disable_GC_SysColors} -{$IFDEF Linux} - {$DEFINE UseLinuxThreading} -{$ENDIF} - {$IFDEF gtk2} {$IFDEF NoGdkPixbufLib} {$UNDEF NoGdkPixbufLib} @@ -135,7 +131,7 @@ type procedure FreeStockItems; virtual; procedure PassCmdLineOptions; override; -{$ifdef UseLinuxThreading} +{$ifdef Unix} procedure InitSynchronizeSupport; procedure ProcessChildSignal; procedure PrepareSynchronize(AObject: TObject); diff --git a/lcl/interfaces/gtk/gtkobject.inc b/lcl/interfaces/gtk/gtkobject.inc index 624f8beedb..269deebf83 100644 --- a/lcl/interfaces/gtk/gtkobject.inc +++ b/lcl/interfaces/gtk/gtkobject.inc @@ -129,7 +129,7 @@ begin end; -{$ifdef UseLinuxThreading} +{$ifdef Unix} // TThread.Synchronize support var @@ -237,7 +237,7 @@ begin ClipboardTypeAtoms[ctSecondarySelection]:=GDK_SELECTION_SECONDARY; ClipboardTypeAtoms[ctClipboard]:=gdk_atom_intern('CLIPBOARD',GdkFalse); -{$ifdef UseLinuxThreading} +{$ifdef Unix} InitSynchronizeSupport; InstallSignalHandler; {$endif} @@ -522,7 +522,7 @@ begin inherited Destroy; end; -{$ifdef UseLinuxThreading} +{$ifdef Unix} procedure TGtkWidgetSet.PrepareSynchronize(AObject: TObject); begin