diff options
| -rw-r--r-- | Assistant/Threads/Merger.hs | 2 | ||||
| -rw-r--r-- | Assistant/Threads/TransferWatcher.hs | 2 | ||||
| -rw-r--r-- | Assistant/Threads/Watcher.hs | 2 | ||||
| -rw-r--r-- | Utility/DirWatcher.hs | 2 | ||||
| -rw-r--r-- | Utility/DirWatcher/Types.hs (renamed from Utility/Types/DirWatcher.hs) | 4 | ||||
| -rw-r--r-- | Utility/FSEvents.hs | 2 | ||||
| -rw-r--r-- | Utility/INotify.hs | 2 | ||||
| -rw-r--r-- | Utility/Kqueue.hs | 2 |
8 files changed, 8 insertions, 10 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index 4a482583f..a1b1693cf 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -13,7 +13,7 @@ import Assistant.BranchChange import Assistant.DaemonStatus import Assistant.ScanRemotes import Utility.DirWatcher -import Utility.Types.DirWatcher +import Utility.DirWatcher.Types import qualified Annex.Branch import qualified Git import qualified Git.Branch diff --git a/Assistant/Threads/TransferWatcher.hs b/Assistant/Threads/TransferWatcher.hs index 7a6e426b3..69fa87022 100644 --- a/Assistant/Threads/TransferWatcher.hs +++ b/Assistant/Threads/TransferWatcher.hs @@ -14,7 +14,7 @@ import Assistant.Drop import Annex.Content import Logs.Transfer import Utility.DirWatcher -import Utility.Types.DirWatcher +import Utility.DirWatcher.Types import qualified Remote import Control.Concurrent diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index ce308b3a3..0f76c6a4c 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -22,7 +22,7 @@ import Assistant.Changes import Assistant.Types.Changes import Assistant.Alert import Utility.DirWatcher -import Utility.Types.DirWatcher +import Utility.DirWatcher.Types import Utility.Lsof import qualified Annex import qualified Annex.Queue diff --git a/Utility/DirWatcher.hs b/Utility/DirWatcher.hs index ba420401e..d038f59ac 100644 --- a/Utility/DirWatcher.hs +++ b/Utility/DirWatcher.hs @@ -13,7 +13,7 @@ module Utility.DirWatcher where -import Utility.Types.DirWatcher +import Utility.DirWatcher.Types #if WITH_INOTIFY import qualified Utility.INotify as INotify diff --git a/Utility/Types/DirWatcher.hs b/Utility/DirWatcher/Types.hs index 30ada9c68..8cfa69d34 100644 --- a/Utility/Types/DirWatcher.hs +++ b/Utility/DirWatcher/Types.hs @@ -5,9 +5,7 @@ - Licensed under the GNU GPL version 3 or higher. -} -{-# LANGUAGE CPP #-} - -module Utility.Types.DirWatcher where +module Utility.DirWatcher.Types where import Common diff --git a/Utility/FSEvents.hs b/Utility/FSEvents.hs index af8c2fc2f..d6663e9d7 100644 --- a/Utility/FSEvents.hs +++ b/Utility/FSEvents.hs @@ -8,7 +8,7 @@ module Utility.FSEvents where import Common hiding (isDirectory) -import Utility.Types.DirWatcher +import Utility.DirWatcher.Types import System.OSX.FSEvents import qualified System.Posix.Files as Files diff --git a/Utility/INotify.hs b/Utility/INotify.hs index 2b5789479..7b5a1fbea 100644 --- a/Utility/INotify.hs +++ b/Utility/INotify.hs @@ -9,7 +9,7 @@ module Utility.INotify where import Common hiding (isDirectory) import Utility.ThreadLock -import Utility.Types.DirWatcher +import Utility.DirWatcher.Types import System.INotify import qualified System.Posix.Files as Files diff --git a/Utility/Kqueue.hs b/Utility/Kqueue.hs index f0559e531..eb5feab00 100644 --- a/Utility/Kqueue.hs +++ b/Utility/Kqueue.hs @@ -18,7 +18,7 @@ module Utility.Kqueue ( ) where import Common -import Utility.Types.DirWatcher +import Utility.DirWatcher.Types import System.Posix.Types import Foreign.C.Types |