From 367181fd2ce73e4a7e039d6f2901c7c6d76e1ea5 Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 27 Oct 2022 07:38:00 +0300 Subject: [PATCH] sync definitions.inc --- python4lazarus/Definition.Inc | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/python4lazarus/Definition.Inc b/python4lazarus/Definition.Inc index 057cf4e..d402c76 100644 --- a/python4lazarus/Definition.Inc +++ b/python4lazarus/Definition.Inc @@ -21,25 +21,6 @@ (* Dr. Dietmar Budelsky, 1998-01-07 *) (**************************************************************************) -{$IFDEF FPC} - {$IFDEF CPUARM} - {$DEFINE CPUARM32} - {$ENDIF} - - {$IFDEF CPUAARCH64} - {$DEFINE CPUARM} - {$DEFINE CPUARM64} - {$ENDIF} - - {$IFDEF DARWIN} - {$DEFINE OSX} - {$ENDIF} - - {$IFDEF UNIX} - {$DEFINE POSIX} - {$ENDIF} -{$ENDIF} - ///////////////////////////////////////////////////////////////////////////// // Delphi, C++ Builder versions ///////////////////////////////////////////////////////////////////////////// @@ -223,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} @@ -249,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}