From 2f9b0ba3517764a9c6c64f67124cdbe29a46a714 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 21 Jun 2013 13:09:09 -0400
Subject: [PATCH] simpler ifdef for linux

---
 Utility/Batch.hs | 4 ++--
 git-annex.cabal  | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Utility/Batch.hs b/Utility/Batch.hs
index 38b588b343..c3c34bf270 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 4e14eb7607..a7a1c31e1b 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