- {$PACKENUM 4} and {$MINENUMSIZE 4} added for C compatible 4 byte enums

- SDL_WM_SetIcon: parameter mask must be PUint8, not Uint8

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1514 b956fd51-792f-4845-bead-9b4dfca2ff2c

2 files changed, 3 insertions, 1 deletions

diff --git a/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc b/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc
index 9cc30e1d..fed972b5 100644
--- a/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc
+++ b/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc
@@ -310,6 +310,7 @@
 {$IFDEF Delphi}
   {$DEFINE Windows}
   {$DEFINE USE_STDCALL}
+  {$MINENUMSIZE 4}
   //{$ALIGN ON}
 {$ENDIF Delphi}
 
@@ -317,6 +318,7 @@
   {$MODE Delphi}          { use Delphi compatibility mode }
   {$H+}
   {$PACKRECORDS C}        // Added for record
+  {$PACKENUM 4}           // Use 4-byte enums
   {$MACRO ON}             // Added For OpenGL
   {$DEFINE Delphi}
   {$DEFINE UseAT}
diff --git a/src/lib/JEDI-SDL/SDL/Pas/sdl.pas b/src/lib/JEDI-SDL/SDL/Pas/sdl.pas
index 62c5c769..0d7e46af 100644
--- a/src/lib/JEDI-SDL/SDL/Pas/sdl.pas
+++ b/src/lib/JEDI-SDL/SDL/Pas/sdl.pas
@@ -3628,7 +3628,7 @@ cdecl; external {$IFNDEF NDS}{$IFDEF __GPC__}name 'SDL_WM_SetCaption'{$ELSE} SDL
   This function must be called before the first call to SDL_SetVideoMode().
   It takes an icon surface, and a mask in MSB format.
   If 'mask' is NULL, the entire icon surface will be used as the icon. }
-procedure SDL_WM_SetIcon(icon: PSDL_Surface; mask: UInt8);
+procedure SDL_WM_SetIcon(icon: PSDL_Surface; mask: PUInt8);
 cdecl; external {$IFNDEF NDS}{$IFDEF __GPC__}name 'SDL_WM_SetIcon'{$ELSE} SDLLibName{$ENDIF __GPC__}{$ENDIF};
 {$EXTERNALSYM SDL_WM_SetIcon}