@@ -66,9 +66,11 @@ module SDL.Raw.Types (
66
66
Palette (.. ),
67
67
PixelFormat (.. ),
68
68
Point (.. ),
69
- FPoint (.. ),
70
69
Rect (.. ),
70
+ #ifdef RECENT_ISH
71
+ FPoint (.. ),
71
72
FRect (.. ),
73
+ #endif
72
74
RendererInfo (.. ),
73
75
RWops (.. ),
74
76
Surface (.. ),
@@ -1334,22 +1336,6 @@ instance Storable Point where
1334
1336
(# poke SDL_Point , x) ptr x
1335
1337
(# poke SDL_Point , y) ptr y
1336
1338
1337
- data FPoint = FPoint
1338
- { fPointX :: ! CFloat
1339
- , fPointY :: ! CFloat
1340
- } deriving (Eq , Show , Typeable )
1341
-
1342
- instance Storable FPoint where
1343
- sizeOf _ = (# size SDL_FPoint )
1344
- alignment = sizeOf
1345
- peek ptr = do
1346
- x <- (# peek SDL_FPoint , x) ptr
1347
- y <- (# peek SDL_FPoint , y) ptr
1348
- return $! FPoint x y
1349
- poke ptr (FPoint x y) = do
1350
- (# poke SDL_FPoint , x) ptr x
1351
- (# poke SDL_FPoint , y) ptr y
1352
-
1353
1339
data Rect = Rect
1354
1340
{ rectX :: ! CInt
1355
1341
, rectY :: ! CInt
@@ -1372,6 +1358,24 @@ instance Storable Rect where
1372
1358
(# poke SDL_Rect , w) ptr w
1373
1359
(# poke SDL_Rect , h) ptr h
1374
1360
1361
+ #ifdef RECENT_ISH
1362
+
1363
+ data FPoint = FPoint
1364
+ { fPointX :: ! CFloat
1365
+ , fPointY :: ! CFloat
1366
+ } deriving (Eq , Show , Typeable )
1367
+
1368
+ instance Storable FPoint where
1369
+ sizeOf _ = (# size SDL_FPoint )
1370
+ alignment = sizeOf
1371
+ peek ptr = do
1372
+ x <- (# peek SDL_FPoint , x) ptr
1373
+ y <- (# peek SDL_FPoint , y) ptr
1374
+ return $! FPoint x y
1375
+ poke ptr (FPoint x y) = do
1376
+ (# poke SDL_FPoint , x) ptr x
1377
+ (# poke SDL_FPoint , y) ptr y
1378
+
1375
1379
data FRect = FRect
1376
1380
{ fRectX :: ! CFloat
1377
1381
, fRectY :: ! CFloat
@@ -1394,6 +1398,8 @@ instance Storable FRect where
1394
1398
(# poke SDL_FRect , w) ptr w
1395
1399
(# poke SDL_FRect , h) ptr h
1396
1400
1401
+ #endif
1402
+
1397
1403
data RendererInfo = RendererInfo
1398
1404
{ rendererInfoName :: ! CString
1399
1405
, rendererInfoFlags :: ! Word32
0 commit comments