Merge pull request #61 from hiratara/windows-compat

Improve Windows compatibility
jwiegley · Jan 11, 2016 · e26e7a6 · e26e7a6
2 parents b0c3ad9 + d8432ef
commit e26e7a6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/gitlib/Git/Tree/Working.hs b/gitlib/Git/Tree/Working.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 module Git.Tree.Working where
 
 import           Control.Applicative
@@ -18,7 +19,11 @@ import           Data.Time.Clock.POSIX (posixSecondsToUTCTime)
 import           Git hiding (Options)
 import           Prelude hiding (log)
 import           System.FilePath.Posix
+#ifndef mingw32_HOST_OS
 import           System.Posix.Files
+#else
+import           System.PosixCompat.Files
+#endif
 
 data FileEntry m = FileEntry
     { fileModTime  :: UTCTime

diff --git a/gitlib/gitlib.cabal b/gitlib/gitlib.cabal
@@ -63,6 +63,9 @@ Library
     if !os(mingw32)
         build-depends:
           unix                 >= 2.5.1.1
+    else
+        build-depends:
+          unix-compat          >= 0.4
     exposed-modules:
         Git
         Git.Blob

diff --git a/hlibgit2/Bindings/Libgit2/Windows.hsc b/hlibgit2/Bindings/Libgit2/Windows.hsc
@@ -3,6 +3,7 @@
 module Bindings.Libgit2.Windows where
 
 #ifdef GIT_WIN32
+#strict_import
 #ccall gitwin_set_codepage , CUInt -> IO ()
 #ccall gitwin_get_codepage , IO (CUInt)
 #ccall gitwin_set_utf8 , IO ()

diff --git a/hlibgit2/hlibgit2.cabal b/hlibgit2/hlibgit2.cabal
@@ -229,6 +229,8 @@ Library
       libgit2/src/win32/utf-conv.c
     include-dirs:
       libgit2/src/win32
+    extra-libraries:
+      ws2_32, regex, winhttp, crypt32, rpcrt4, ssl, crypto
   else
     cc-options: -D_GNU_SOURCE -DOPENSSL_SHA1 -Wno-deprecated-declarations
     c-sources: