Fix Windows build, version bump

Author: RyanGlScott

CHANGES.markdown

@@ -1,3 +1,6 @@
+## Changes in 0.8.1.1
+ - Fixed Windows build
+
 ## Changes in 0.8.1
  - Implement `setEnv` and `unsetEnv` in `System.Environment.Compat` (which were
    ported from the `setenv` package). As a result, `base-compat` now depends

base-compat.cabal

@@ -1,5 +1,5 @@
 name:             base-compat
-version:          0.8.1
+version:          0.8.1.1
 license:          MIT
 license-file:     LICENSE
 copyright:        (c) 2012-2015 Simon Hengel,

src/System/Environment/Compat.hs

@@ -16,7 +16,7 @@ module System.Environment.Compat (
 import           System.Environment
 
 #if !(MIN_VERSION_base(4,7,0))
-import Prelude.Compat
+import           Prelude.Compat
 
 # ifdef mingw32_HOST_OS
 import           Control.Monad
@@ -26,35 +26,34 @@ import           GHC.Windows
 # else
 import qualified System.Posix.Env as Posix
 # endif
-#endif
 
-#ifdef mingw32_HOST_OS
-# if defined(i386_HOST_ARCH)
-#  define WINDOWS_CCONV stdcall
-# elif defined(x86_64_HOST_ARCH)
-#  define WINDOWS_CCONV ccall
-# else
-#  error Unknown mingw32 arch
-# endif
+# ifdef mingw32_HOST_OS
+
+#  if defined(i386_HOST_ARCH)
+#   define WINDOWS_CCONV stdcall
+#  elif defined(x86_64_HOST_ARCH)
+#   define WINDOWS_CCONV ccall
+#  else
+#   error Unknown mingw32 arch
+#  endif
 
 foreign import WINDOWS_CCONV unsafe "windows.h GetLastError"
   c_GetLastError:: IO DWORD
 
 eRROR_ENVVAR_NOT_FOUND :: DWORD
 eRROR_ENVVAR_NOT_FOUND = 203
 
-#endif
+# endif
 
-#if !(MIN_VERSION_base(4,6,0))
+# if !(MIN_VERSION_base(4,6,0))
 -- | Return the value of the environment variable @var@, or @Nothing@ if
 -- there is no such value.
 --
 -- For POSIX users, this is equivalent to 'System.Posix.Env.getEnv'.
 lookupEnv :: String -> IO (Maybe String)
 lookupEnv k = lookup k `fmap` getEnvironment
-#endif
+# endif
 
-#if !(MIN_VERSION_base(4,7,0))
 -- | @setEnv name value@ sets the specified environment variable to @value@.
 --
 -- On Windows setting an environment variable to the /empty string/ removes