diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-06-21 13:09:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-06-21 13:09:09 -0400 |
| commit | 46d2cfbd3baf26efa2311b287a80d429bed99b2e (patch) | |
| tree | 63164ab647717cb56eca1fd8a4cd2348f1178589 | |
| parent | ebf6810492aa2338ec0614f9b286cc38baabeb71 (diff) | |
simpler ifdef for linux
| -rw-r--r-- | Utility/Batch.hs | 4 | ||||
| -rw-r--r-- | git-annex.cabal | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Utility/Batch.hs b/Utility/Batch.hs index 38b588b34..c3c34bf27 100644 --- a/Utility/Batch.hs +++ b/Utility/Batch.hs @@ -9,7 +9,7 @@ module Utility.Batch where -#if defined(__LINUX__) || defined(__ANDROID__) +#if defined(linux_HOST_OS) || defined(__ANDROID__) import Control.Concurrent.Async import System.Posix.Process #endif @@ -26,7 +26,7 @@ import System.Posix.Process - systems, the action is simply ran. -} batch :: IO a -> IO a -#if defined(__LINUX__) || defined(__ANDROID__) +#if defined(linux_HOST_OS) || defined(__ANDROID__) batch a = wait =<< batchthread where batchthread = asyncBound $ do diff --git a/git-annex.cabal b/git-annex.cabal index 4e14eb760..a7a1c31e1 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -115,9 +115,6 @@ Executable git-annex Build-Depends: data-endian CPP-Options: -D__ANDROID__ - if os(linux) - CPP-Options: -D__LINUX__ - if os(linux) && flag(Inotify) Build-Depends: hinotify CPP-Options: -DWITH_INOTIFY |