Skip to content

FPC fix of PythonEngine #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mamin27 wants to merge 3 commits into from
Closed

FPC fix of PythonEngine #112

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c2b636
Merge pull request #1 from pyscripter/master
mamin27 Feb 4, 2020
7bb6294
Merge pull request #2 from pyscripter/master
mamin27 Feb 18, 2020
9d26ff9
DoOpenDll fix for FPC
mamin27 Feb 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions PythonForDelphi/Components/Sources/Core/PythonEngine.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3135,9 +3135,9 @@ implementation
AnsiStrings,
{$ENDIF}
{$IFDEF MSWINDOWS}
Math,
Registry;
Registry,
{$ENDIF}
Math;


(*******************************************************)
Expand Down Expand Up @@ -3308,7 +3308,7 @@ procedure TPythonInputOutput.UpdateCurrentThreadLine;
(** **)
(*******************************************************)

procedure TDynamicDll.DoOpenDll(const aDllName : string);
procedure TDynamicDll.DoOpenDll(const aDllName : String);
begin
if not IsHandleValid then
begin
Expand All @@ -3323,7 +3323,7 @@ procedure TDynamicDll.DoOpenDll(const aDllName : string);
{$ELSE}
//Linux: need here RTLD_GLOBAL, so Python can do "import ctypes"
FDLLHandle := THandle(dlopen(PAnsiChar(AnsiString(GetDllPath+DllName)),
RTLD_LAZY+RTLD_GLOBAL));
RTLD_LAZY+RTLD_GLOBAL)
{$ENDIF}
);
end;
Expand Down