mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

simpler ifdef for linux

Browse source
This commit is contained in:
Joey Hess 2013-06-21 13:09:09 -04:00
parent 7f4d4952ef
commit 2f9b0ba351
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Utility/Batch.hs
View file

@ -9,7 +9,7 @@
module Utility.Batch where module Utility.Batch where
#if defined(__LINUX__) || defined(__ANDROID__) #if defined(linux_HOST_OS) || defined(__ANDROID__)
import Control.Concurrent.Async import Control.Concurrent.Async
import System.Posix.Process import System.Posix.Process
#endif #endif
@ -26,7 +26,7 @@ import System.Posix.Process
- systems, the action is simply ran. - systems, the action is simply ran.
-} -}
batch :: IO a -> IO a batch :: IO a -> IO a
#if defined(__LINUX__) || defined(__ANDROID__) #if defined(linux_HOST_OS) || defined(__ANDROID__)
batch a = wait =<< batchthread batch a = wait =<< batchthread
where where
batchthread = asyncBound $ do batchthread = asyncBound $ do

3
git-annex.cabal
View file

@ -115,9 +115,6 @@ Executable git-annex
Build-Depends: data-endian Build-Depends: data-endian
CPP-Options: -D__ANDROID__ CPP-Options: -D__ANDROID__
if os(linux)
CPP-Options: -D__LINUX__
if os(linux) && flag(Inotify) if os(linux) && flag(Inotify)
Build-Depends: hinotify Build-Depends: hinotify
CPP-Options: -DWITH_INOTIFY CPP-Options: -DWITH_INOTIFY