Add the WANT_CWCHAR_T compile-type symbol

Author: suve

units/ctypes.inc

@@ -110,29 +110,31 @@ type
 
   ppcuint8 = ^pcuint8;
 
-  (* wchar_t is the "wide character" type of the C language.
-   * The size of this type is platform- and compiler-dependent.
-   *
-   * While FPC does have it's own "wide character" type, System.WideChar,
-   * that one is defined as always being 16-bits, so we can't re-use it here.
-   *
-   * When using FPC on Unices, the UnixType unit provides a wchar_t definition.
-   *
-   * On other systems/compiler combos, let's just go
-   * by what the CPP reference wiki claims, i.e:
-   * - wchar_t is 16-bits on Windows
-   * - wchar_t is 32-bits on Linux "and many other non-Windows systems"
-   *
-   * See: https://en.cppreference.com/w/cpp/language/types#Character_types
-   *)
-  {$IF DEFINED(FPC) AND DEFINED(UNIX)}
-    cwchar_t = UnixType.wchar_t;
-  {$ELSE}
-    {$IF DEFINED(WIN32) OR DEFINED(WIN64)}
-      cwchar_t = cuint16;
+  {$IFDEF WANT_CWCHAR_T}
+    (* wchar_t is the "wide character" type of the C language.
+     * The size of this type is platform- and compiler-dependent.
+     *
+     * While FPC does have it's own "wide character" type, System.WideChar,
+     * that one is defined as always being 16-bits, so we can't re-use it here.
+     *
+     * When using FPC on Unices, the UnixType unit provides a wchar_t definition.
+     *
+     * On other systems/compiler combos, let's just go
+     * by what the CPP reference wiki claims, i.e:
+     * - wchar_t is 16-bits on Windows
+     * - wchar_t is 32-bits on Linux "and many other non-Windows systems"
+     *
+     * See: https://en.cppreference.com/w/cpp/language/types#Character_types
+     *)
+    {$IF DEFINED(FPC) AND DEFINED(UNIX)}
+      cwchar_t = UnixType.wchar_t;
     {$ELSE}
-      cwchar_t = cuint32;
+      {$IF DEFINED(WIN32) OR DEFINED(WIN64)}
+        cwchar_t = cuint16;
+      {$ELSE}
+        cwchar_t = cuint32;
+      {$ENDIF}
     {$ENDIF}
+    {$EXTERNALSYM cwchar_t}
+    pcwchar_t = ^cwchar_t;
   {$ENDIF}
-  {$EXTERNALSYM cwchar_t}
-  pcwchar_t = ^cwchar_t;

units/sdl2.pas

@@ -153,6 +153,7 @@ interface
   {$ENDIF}
 
 
+{$DEFINE WANT_CWCHAR_T}
 {$I ctypes.inc}                  // C data types
 
                                  {SDL2 version of the represented header file}