Merge pull request #148 from varosi/feature/windows_builds

Fixed #125 build under Windows

3 files changed, 13 insertions, 3 deletions

diff --git a/INSTALL.md b/INSTALL.md
index 94964d2..f195de6 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -56,9 +56,14 @@ using this method.
 [winpack]: https://github.com/downloads/AlbertoRuiz/hmatrix/gsl-lapack-windows.zip
 
 ### Alternative Windows build
+
 1) > cabal update
+
 2) Download and unzip somewhere OpenBLAS http://www.openblas.net/
-3) > cabal install --flags=openblas --extra-lib-dirs=C:\...\OpenBLAS\lib --extra-include-dir=C:\...\OpenBLAS\include
+
+3) In a normal Windows cmd:
+
+     > cabal install --flags=openblas --extra-lib-dirs=C:\...\OpenBLAS\lib --extra-include-dir=C:\...\OpenBLAS\include
 
 ## Tests ###############################################
 
diff --git a/packages/base/hmatrix.cabal b/packages/base/hmatrix.cabal
index 3a11135..7bed0d3 100644
--- a/packages/base/hmatrix.cabal
+++ b/packages/base/hmatrix.cabal
@@ -1,5 +1,5 @@
 Name:               hmatrix
-Version:            0.17.0.0
+Version:            0.17.0.1
 License:            BSD3
 License-file:       LICENSE
 Author:             Alberto Ruiz
@@ -74,7 +74,7 @@ library
                         Internal.Util
                         Internal.Modular
                         Internal.Static
-                        
+
     C-sources:          src/Internal/C/lapack-aux.c
                         src/Internal/C/vector-aux.c
 
diff --git a/packages/base/src/Internal/C/vector-aux.c b/packages/base/src/Internal/C/vector-aux.c
index a52b969..9dbf536 100644
--- a/packages/base/src/Internal/C/vector-aux.c
+++ b/packages/base/src/Internal/C/vector-aux.c
@@ -939,7 +939,12 @@ int vectorScan(char * file, int* n, double**pp){
    See: http://www.evanjones.ca/random-thread-safe.html
 */
 #pragma message "randomVector is not thread-safe in OSX and FreeBSD"
+#endif
 
+#if defined (__APPLE__) || (__FreeBSD__) || defined(_WIN32) || defined(WIN32)
+/* Windows use thread-safe random
+   See: http://stackoverflow.com/questions/143108/is-windows-rand-s-thread-safe
+*/
 inline double urandom() {
     /* the probalility of matching will be theoretically p^3(in fact, it is not)
        p is matching probalility of random().