Browse Source

Fix for THANDLE_32 define on OSX for FreePascal.

Remy Lebeau 6 years ago
parent
commit
39b514b661

+ 6 - 2
Lib/Core/IdCompilerDefines.inc

@@ -1725,8 +1725,12 @@ word to an 8 bit byte and an 8 bit byte field named sa_len was added.
       {$DEFINE THANDLE_32}
     {$ENDIF}
   {$ENDIF}
-  {$IFDEF OSX}  // !!! ADDED OSX BY EMBT
-    {$DEFINE THANDLE_CPUBITS}
+  {$IFDEF OSX}
+    {$IFDEF FPC}
+      {$DEFINE THANDLE_32}
+    {$ELSE}
+      {$DEFINE THANDLE_CPUBITS} // !!! ADDED OSX BY EMBT
+    {$ENDIF}
   {$ENDIF}
 {$ENDIF}
 {$IFDEF EMBEDDED}

+ 6 - 2
Lib/FCL/IdCompilerDefines.inc

@@ -1725,8 +1725,12 @@ word to an 8 bit byte and an 8 bit byte field named sa_len was added.
       {$DEFINE THANDLE_32}
     {$ENDIF}
   {$ENDIF}
-  {$IFDEF OSX}  // !!! ADDED OSX BY EMBT
-    {$DEFINE THANDLE_CPUBITS}
+  {$IFDEF OSX}
+    {$IFDEF FPC}
+      {$DEFINE THANDLE_32}
+    {$ELSE}
+      {$DEFINE THANDLE_CPUBITS} // !!! ADDED OSX BY EMBT
+    {$ENDIF}
   {$ENDIF}
 {$ENDIF}
 {$IFDEF EMBEDDED}

+ 6 - 2
Lib/Protocols/IdCompilerDefines.inc

@@ -1725,8 +1725,12 @@ word to an 8 bit byte and an 8 bit byte field named sa_len was added.
       {$DEFINE THANDLE_32}
     {$ENDIF}
   {$ENDIF}
-  {$IFDEF OSX}  // !!! ADDED OSX BY EMBT
-    {$DEFINE THANDLE_CPUBITS}
+  {$IFDEF OSX}
+    {$IFDEF FPC}
+      {$DEFINE THANDLE_32}
+    {$ELSE}
+      {$DEFINE THANDLE_CPUBITS} // !!! ADDED OSX BY EMBT
+    {$ENDIF}
   {$ENDIF}
 {$ENDIF}
 {$IFDEF EMBEDDED}

+ 6 - 2
Lib/SuperCore/IdCompilerDefines.inc

@@ -1725,8 +1725,12 @@ word to an 8 bit byte and an 8 bit byte field named sa_len was added.
       {$DEFINE THANDLE_32}
     {$ENDIF}
   {$ENDIF}
-  {$IFDEF OSX}  // !!! ADDED OSX BY EMBT
-    {$DEFINE THANDLE_CPUBITS}
+  {$IFDEF OSX}
+    {$IFDEF FPC}
+      {$DEFINE THANDLE_32}
+    {$ELSE}
+      {$DEFINE THANDLE_CPUBITS} // !!! ADDED OSX BY EMBT
+    {$ENDIF}
   {$ENDIF}
 {$ENDIF}
 {$IFDEF EMBEDDED}

+ 6 - 2
Lib/System/IdCompilerDefines.inc

@@ -1725,8 +1725,12 @@ word to an 8 bit byte and an 8 bit byte field named sa_len was added.
       {$DEFINE THANDLE_32}
     {$ENDIF}
   {$ENDIF}
-  {$IFDEF OSX}  // !!! ADDED OSX BY EMBT
-    {$DEFINE THANDLE_CPUBITS}
+  {$IFDEF OSX}
+    {$IFDEF FPC}
+      {$DEFINE THANDLE_32}
+    {$ELSE}
+      {$DEFINE THANDLE_CPUBITS} // !!! ADDED OSX BY EMBT
+    {$ENDIF}
   {$ENDIF}
 {$ENDIF}
 {$IFDEF EMBEDDED}