diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-11 12:21:26 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-11 12:21:26 -0400 |
| commit | b15ce31aa84ac2ae3d78e82868fb6065f15c99a4 (patch) | |
| tree | 2d547c505b65e23c2e0083098f1f860782a36dfb /Assistant.hs | |
| parent | 028916acae51217b27de59d19f70ecc24cc2ed36 (diff) | |
| parent | f0f17dd7ff1b6220526a9c42683d7c6272598f64 (diff) | |
Merge branch 'master' into adjustedbranch
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Assistant.hs b/Assistant.hs index 265827a77..4dab6f162 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -25,7 +25,7 @@ import Assistant.Threads.RemoteControl import Assistant.Threads.SanityChecker import Assistant.Threads.Cronner import Assistant.Threads.ProblemFixer -#ifdef WITH_CLIBS +#ifndef mingw32_HOST_OS import Assistant.Threads.MountWatcher #endif import Assistant.Threads.NetWatcher @@ -170,7 +170,7 @@ startDaemon assistant foreground startdelay cannotrun listenhost startbrowser = , assist $ sanityCheckerDailyThread urlrenderer , assist sanityCheckerHourlyThread , assist $ problemFixerThread urlrenderer -#ifdef WITH_CLIBS +#ifndef mingw32_HOST_OS , assist $ mountWatcherThread urlrenderer #endif , assist netWatcherThread |