FreeBSD build fixes

[d2df-sdl.git] / src / lib / sdl2 / sdl2.pas

diff --git a/src/lib/sdl2/sdl2.pas b/src/lib/sdl2/sdl2.pas
index 92f71d93376678ee60c0049ab7c6c0c794c9808a..168742e872eb3b411f2d7060755c914e5aa15251 100644 (file)
--- a/src/lib/sdl2/sdl2.pas
+++ b/src/lib/sdl2/sdl2.pas
@@ -1,3 +1,4 @@
+{$MODE DELPHI}
 unit SDL2;
 
 {
@@ -136,12 +137,12 @@ interface
       Windows;
   {$ENDIF}
 
-  {$IFDEF LINUX}
+  {$IFDEF UNIX}
     uses
       X,
       XLib;
   {$ENDIF}
-  
+
   {$IFDEF DARWIN}
     uses
       X,
@@ -241,7 +242,7 @@ end;
 //from "sdl_mouse.h"
 function SDL_Button(button: SInt32): SInt32;
 begin
-  Result := 1 shl (button - 1); 
+  Result := 1 shl (button - 1);
 end;
 
 {$IFDEF WINDOWS}
@@ -303,7 +304,7 @@ function SDL_LoadWAV(_file: PAnsiChar; spec: PSDL_AudioSpec; audio_buf: PPUInt8;
 begin
   Result := SDL_LoadWAV_RW(SDL_RWFromFile(_file, 'rb'), 1, spec, audio_buf, audio_len);
 end;
-  
+
 function SDL_AUDIO_BITSIZE(x: Cardinal): Cardinal;
 begin
   Result := x and SDL_AUDIO_MASK_BITSIZE;
@@ -341,29 +342,29 @@ end;
 
 //from "sdl_pixels.h"
 
-function SDL_PIXELFLAG(X: Cardinal): Boolean;
+function SDL_PIXELFLAG(X: Cardinal): Cardinal;
 begin
-  Result := (X shr 28) = $0F;
+  Result := (X shr 28) and $0F;
 end;
 
-function SDL_PIXELTYPE(X: Cardinal): Boolean;
+function SDL_PIXELTYPE(X: Cardinal): Cardinal;
 begin
-  Result := (X shr 24) = $0F;
+  Result := (X shr 24) and $0F;
 end;
 
-function SDL_PIXELORDER(X: Cardinal): Boolean;
+function SDL_PIXELORDER(X: Cardinal): Cardinal;
 begin
-  Result := (X shr 20) = $0F;
+  Result := (X shr 20) and $0F;
 end;
 
-function SDL_PIXELLAYOUT(X: Cardinal): Boolean;
+function SDL_PIXELLAYOUT(X: Cardinal): Cardinal;
 begin
-  Result := (X shr 16) = $0F;
+  Result := (X shr 16) and $0F;
 end;
 
-function SDL_BITSPERPIXEL(X: Cardinal): Boolean;
+function SDL_BITSPERPIXEL(X: Cardinal): Cardinal;
 begin
-  Result := (X shr 8) = $FF;
+  Result := (X shr 8) and $FF;
 end;
 
 function SDL_IsPixelFormat_FOURCC(format: Variant): Boolean;