Fix cpp-options and revert underscoring (#258)

Author: dpwiz

sdl2.cabal

@@ -129,7 +129,7 @@ library
 
   if flag(recent-ish)
     cpp-options:
-      -D __RECENT_ISH__
+      -DRECENT_ISH
     pkgconfig-depends:
       sdl2 >= 2.0.10
   else

src/SDL/Raw/Types.hsc

@@ -69,7 +69,7 @@ module SDL.Raw.Types (
   PixelFormat(..),
   Point(..),
   Rect(..),
-#ifdef __RECENT_ISH__
+#ifdef RECENT_ISH
   FPoint(..),
   FRect(..),
 #endif
@@ -1360,7 +1360,7 @@ instance Storable Rect where
     (#poke SDL_Rect, w) ptr w
     (#poke SDL_Rect, h) ptr h
 
-#ifdef __RECENT_ISH__
+#ifdef RECENT_ISH
 
 data FPoint = FPoint
   { fPointX :: !CFloat

src/SDL/Raw/Video.hs

@@ -108,7 +108,7 @@ module SDL.Raw.Video (
   renderClear,
   renderCopy,
   renderCopyEx,
-#ifdef __RECENT_ISH__
+#ifdef RECENT_ISH
   renderCopyExF,
 #endif
   renderDrawLine,
@@ -328,7 +328,7 @@ foreign import ccall "SDL.h SDL_QueryTexture" queryTextureFFI :: Texture -> Ptr
 foreign import ccall "SDL.h SDL_RenderClear" renderClearFFI :: Renderer -> IO CInt
 foreign import ccall "SDL.h SDL_RenderCopy" renderCopyFFI :: Renderer -> Texture -> Ptr Rect -> Ptr Rect -> IO CInt
 foreign import ccall "SDL.h SDL_RenderCopyEx" renderCopyExFFI :: Renderer -> Texture -> Ptr Rect -> Ptr Rect -> CDouble -> Ptr Point -> RendererFlip -> IO CInt
-#ifdef __RECENT_ISH__
+#ifdef RECENT_ISH
 foreign import ccall "SDL.h SDL_RenderCopyExF" renderCopyExFFFI :: Renderer -> Texture -> Ptr Rect -> Ptr FRect -> CDouble -> Ptr FPoint -> RendererFlip -> IO CInt
 #endif
 foreign import ccall "SDL.h SDL_RenderDrawLine" renderDrawLineFFI :: Renderer -> CInt -> CInt -> CInt -> CInt -> IO CInt
@@ -841,7 +841,7 @@ renderCopyEx :: MonadIO m => Renderer -> Texture -> Ptr Rect -> Ptr Rect -> CDou
 renderCopyEx v1 v2 v3 v4 v5 v6 v7 = liftIO $ renderCopyExFFI v1 v2 v3 v4 v5 v6 v7
 {-# INLINE renderCopyEx #-}
 
-#ifdef __RECENT_ISH__
+#ifdef RECENT_ISH
 renderCopyExF :: MonadIO m => Renderer -> Texture -> Ptr Rect -> Ptr FRect -> CDouble -> Ptr FPoint -> RendererFlip -> m CInt
 renderCopyExF v1 v2 v3 v4 v5 v6 v7 = liftIO $ renderCopyExFFFI v1 v2 v3 v4 v5 v6 v7
 {-# INLINE renderCopyExF #-}

src/SDL/Video/Renderer.hs

@@ -23,7 +23,7 @@ module SDL.Video.Renderer
   , clear
   , copy
   , copyEx
-#ifdef __RECENT_ISH__
+#ifdef RECENT_ISH
   , copyExF
 #endif
   , drawLine
@@ -765,7 +765,7 @@ copyEx (Renderer r) (Texture t) srcRect dstRect theta center flips =
                       V2 x y -> (if x then Raw.SDL_FLIP_HORIZONTAL else 0) .|.
                                (if y then Raw.SDL_FLIP_VERTICAL else 0))
 
-#ifdef __RECENT_ISH__
+#ifdef RECENT_ISH
 -- | Copy a portion of the texture to the current rendering target, optionally rotating it by angle around the given center and also flipping it top-bottom and/or left-right.
 copyExF :: MonadIO m
        => Renderer -- ^ The rendering context