Merge branch 'pyscripter:master' into master

Author: lmbelo

Source/Definition.Inc

@@ -204,22 +204,43 @@
 
 {$IFDEF FPC}
   {$MODE DELPHI}
+
   {$IFDEF CPU64}
     {$DEFINE CPU64BITS}
   {$ENDIF CPU64}
-  {$IFDEF CPU386}
+
+  {$IFDEF CPU86}
     {$DEFINE CPUX86}
-  {$ENDIF CPU32}
+  {$ENDIF CPU86}
+
   {$IFDEF DARWIN}
+    {$DEFINE OSX}
     {$DEFINE MACOS}
-    {$DEFINE ALIGN_STACK}
     {$IFDEF CPU32}
       {$DEFINE MACOS32}
     {$ENDIF CPU32}
+    {$IFDEF CPU64}
+      {$DEFINE MACOS64}
+      {$DEFINE OSX64}
+    {$ENDIF CPU64}
   {$ENDIF DARWIN}
+
+  {$IFDEF CPUARM}
+    {$DEFINE CPUARM32}
+  {$ENDIF}
+
+  {$IFDEF CPUAARCH64}
+    {$DEFINE CPUARM}
+    {$DEFINE CPUARM64}
+  {$ENDIF}
+  
   {$IFDEF UNIX}
     {$DEFINE POSIX}
   {$ENDIF UNIX}
+
+  {$IFDEF ANDROID}
+    {$DEFINE POSIX}
+  {$ENDIF ANDROID}
 {$ENDIF FPC}
 
 {$IFDEF DELPHIXE_OR_HIGHER}
@@ -230,8 +251,6 @@
   {$LEGACYIFEND ON}
 {$ENDIF DELPHIXE4_OR_HIGHER}
 
-{$IFDEF DELPHIXE2_OR_HIGHER}
-  {$IFDEF MACOS}
-    {$DEFINE DARWIN}
-  {$ENDIF MACOS}
-{$ENDIF DELPHIXE2_OR_HIGHER}
+{$IFDEF MACOS}
+  {$DEFINE DARWIN}
+{$ENDIF MACOS}

Source/MethodCallBack.pas

@@ -194,7 +194,7 @@ procedure GetCodeMem(var ptr: PByte; size: integer);
     {$IFEND}
     if mprotect(page, PageSize, flags) <> 0 then
       raise EMProtectError.CreateFmt('MProtect error: %s', [
-        SysErrorMessage(GetLastError())]);
+        SysErrorMessage({$IFDEF FPC}GetLastOSError{$ELSE}GetLastError{$ENDIF}())]);
   {$ENDIF}
     page^.next:=CodeMemPages;
     CodeMemPages:=page;
@@ -210,7 +210,7 @@ procedure GetCodeMem(var ptr: PByte; size: integer);
     //RW permission to the entire page for new changes...
     if mprotect(page, PageSize, PROT_READ or PROT_WRITE) <> 0 then
       raise EMProtectError.CreateFmt('MProtect error: %s', [
-        SysErrorMessage(GetLastError())]);
+        SysErrorMessage({$IFDEF FPC}GetLastOSError{$ELSE}GetLastError{$ENDIF}())]);
   end;
   {$ELSE}
   end;
@@ -751,7 +751,7 @@ function  GetCallBack(Self: TObject; Method: Pointer; ArgNum: Integer;
     //X permission to the entire page for executions...
     if mprotect(CodeMemPages, PageSize, PROT_EXEC) <> 0 then
       raise EMProtectError.CreateFmt('MProtect error: %s', [
-        SysErrorMessage(GetLastError())]);
+        SysErrorMessage({$IFDEF FPC}GetLastOSError{$ELSE}GetLastError{$ENDIF}())]);
   {$IFEND}
 
   Result := Pointer(Q); //set arm mode