Skip to content

Commit

Permalink
Warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
23Skidoo committed Aug 29, 2013
1 parent 47b914c commit c9e1050
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Cabal/Distribution/Simple/PreProcess.hs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ import qualified Distribution.Simple.PackageIndex as PackageIndex
import Distribution.Simple.CCompiler
( cSourceExtensions )
import Distribution.Simple.Compiler
( CompilerFlavor(..), Compiler(..), compilerFlavor, compilerVersion )
( CompilerFlavor(..), compilerFlavor, compilerVersion )
import Distribution.Simple.LocalBuildInfo
( LocalBuildInfo(..), Component(..) )
import Distribution.Simple.BuildPaths (autogenModulesDir,cppHeaderName)
Expand Down
3 changes: 1 addition & 2 deletions cabal-install/Distribution/Client/Compat/Environment.hs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import Control.Monad
import Foreign.C.Types
import Foreign.C.String
import Foreign.C.Error (throwErrnoIfMinus1_)
import System.Posix.Internals ( withFilePath )
#endif /* mingw32_HOST_OS */

#if MIN_VERSION_base(4,6,0)
Expand All @@ -36,8 +37,6 @@ import System.Environment (getEnv)
import Distribution.Compat.Exception (catchIO)
#endif

import System.Posix.Internals ( withFilePath )

#if !MIN_VERSION_base(4,6,0)
-- | @lookupEnv var@ returns the value of the environment variable @var@, or
-- @Nothing@ if there is no such value.
Expand Down
2 changes: 1 addition & 1 deletion cabal-install/Distribution/Client/Win32SelfUpgrade.hs
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ scheduleOurDemise verbosity dstPath tmpPath mkArgs = do

let args = mkArgs (show ourPID) tmpPath
log $ "launching child " ++ unwords (dstPath : map show args)
runProcess dstPath args Nothing Nothing Nothing Nothing Nothing
_ <- runProcess dstPath args Nothing Nothing Nothing Nothing Nothing

log $ "waiting for the child to start up"
waitForSingleObject event (10*1000) -- wait at most 10 sec
Expand Down

0 comments on commit c9e1050

Please sign in to comment.