Merge pull request #104 from suve/fix-delphi-issues

Fix Delphi issues

Author: Free-Pascal-meets-SDL-Website

units/ctypes.inc

@@ -28,10 +28,6 @@ type
   cbool = LongBool;
   {$EXTERNALSYM cbool}
 
-  pcint = ^cint;
-  cint = Integer;
-  {$EXTERNALSYM cint}
-
   pcint8 = ^cint8;
   cint8 = ShortInt;
   {$EXTERNALSYM cint8}
@@ -56,12 +52,6 @@ type
   cuint32 = LongWord;
   {$EXTERNALSYM cuint32}
 
-  culong = LongWord;
-  {$EXTERNALSYM culong}
-
-  cuint = LongWord;
-  {$EXTERNALSYM cuint}
-
   {$IFNDEF Has_Int64}
      pcint64 = ^cint64;
      cint64 = record
@@ -92,11 +82,39 @@ type
   {$ELSE}
     csize_t = cuint64;
   {$ENDIF}
-  {$EXTERNALSYM SIZE_T}
+  {$EXTERNALSYM csize_t}
 
   pcfloat = ^cfloat;
   cfloat = Single;
   {$EXTERNALSYM cfloat}
+
+  pcint = ^cint;
+  pcuint = ^cuint;
+  pclong = ^clong;
+  pculong = ^culong;
+  {
+    Integer type sizes based on:
+    https://en.cppreference.com/w/c/language/arithmetic_types#Data_models
+  }
+  cint = cint32;
+  cuint = cuint32;
+  {$IF DEFINED(CPU32) OR DEFINED(CPU32BITS)}
+    clong = cint32;
+    culong = cuint32;
+  {$ELSE} // 64-bit
+    {$IFDEF MSWINDOWS}
+      clong = cint32;
+      culong = cuint32;
+    {$ELSE}
+      clong = cint64;
+      culong = cuint64;
+    {$ENDIF}
+  {$ENDIF}
+  {$EXTERNALSYM cint}
+  {$EXTERNALSYM cuint}
+  {$EXTERNALSYM clong}
+  {$EXTERNALSYM culong}
+
 {$ENDIF}
 
 { Data types for all compilers }