diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-06 17:23:30 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-06 17:23:30 -0400 |
| commit | 29a150263da17a2be21f5fb7b24ab2ee95ffcaeb (patch) | |
| tree | 021a4bb2c391baa7049138c787e84d713dd3eb52 | |
| parent | a822081a15fa842f468c3cd92a18e3f795fafcc0 (diff) | |
remove __WINDOWS__ ifdef
| -rw-r--r-- | Remote/Helper/Hooks.hs | 2 | ||||
| -rw-r--r-- | git-annex.cabal | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Remote/Helper/Hooks.hs b/Remote/Helper/Hooks.hs index 665da1e10..91c6318bf 100644 --- a/Remote/Helper/Hooks.hs +++ b/Remote/Helper/Hooks.hs @@ -73,7 +73,7 @@ runHooks r starthook stophook a = do run starthook Annex.addCleanup (remoteid ++ "-stop-command") $ runstop lck -#ifndef __WINDOWS__ +#ifndef mingw32_HOST_OS runstop lck = do -- Drop any shared lock we have, and take an -- exclusive lock, without blocking. If the lock diff --git a/git-annex.cabal b/git-annex.cabal index 97a3a7a34..20ac48511 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -97,9 +97,7 @@ Executable git-annex if flag(Production) GHC-Options: -O2 - if os(windows) - CPP-Options: -D__WINDOWS__ - else + if (! os(windows)) Build-Depends: unix if flag(TestSuite) |