Merge pull request #138 from ghcjs/hkm/remove-cpp

Remove old GHCJS support
ghcjs · May 22, 2024 · 1a97fcd · 1a97fcd
2 parents b6c0f11 + 41ea0fb
commit 1a97fcd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/JavaScript/Web/AnimationFrame.hs b/JavaScript/Web/AnimationFrame.hs
@@ -2,7 +2,6 @@
 {-# LANGUAGE JavaScriptFFI #-}
 {-# LANGUAGE InterruptibleFFI #-}
 {-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE CPP #-}
 
 {- |
      Animation frames are the browser's mechanism for smooth animation.
@@ -65,11 +64,7 @@ cancelAnimationFrame h = js_cancelAnimationFrame h
 
 foreign import javascript unsafe "(() => { return { handle: null, callback: null }; })"
   js_makeAnimationFrameHandle :: IO AnimationFrameHandle
-#ifdef __GHCJS__
-foreign import javascript unsafe "(() => { return { handle: null, callback: $1 }; })"
-#else
 foreign import javascript unsafe "(($1) => { return { handle: null, callback: $1 }; })"
-#endif
   js_makeAnimationFrameHandleCallback :: JSVal -> IO AnimationFrameHandle
 foreign import javascript unsafe "h$animationFrameCancel"
   js_cancelAnimationFrame :: AnimationFrameHandle -> IO ()

diff --git a/ghcjs-base.cabal b/ghcjs-base.cabal
@@ -134,7 +134,7 @@ library
                    scientific           >= 0.3.7 && < 0.4,
                    vector               >= 0.10 && < 0.14,
                    containers           >= 0.5  && < 0.8,
-                   time                 >= 1.5  && < 1.13,
+                   time                 >= 1.5  && < 1.15,
                    hashable             >= 1.2  && < 1.5,
                    unordered-containers >= 0.2  && < 0.3,
                    attoparsec           >= 0.11 && < 0.15,