3 files changed, 53 insertions, 3 deletions

diff --git a/packages/base/THANKS.md b/packages/base/THANKS.md
index f29775a..f331dea 100644
--- a/packages/base/THANKS.md
+++ b/packages/base/THANKS.md
@@ -192,7 +192,8 @@ module reorganization, monadic mapVectorM, and many other improvements.
 
 - Matt Peddie wrote the interfaces to the interpolation and simulated annealing modules.
 
-- "maxc01" solved uninstallability in FreeBSD and improved urandom
+- "maxc01" solved uninstallability in FreeBSD, improved urandom, and fixed a Windows
+  link error using rand_s.
 
 - "ntfrgl" added {take,drop}Last{Rows,Columns} and odeSolveVWith with generalized step control function
    and fixed link errors related to mod/mod_l.
diff --git a/packages/base/hmatrix.cabal b/packages/base/hmatrix.cabal
index bacc629..0cfbd88 100644
--- a/packages/base/hmatrix.cabal
+++ b/packages/base/hmatrix.cabal
@@ -1,5 +1,5 @@
 Name:               hmatrix
-Version:            0.17.0.1
+Version:            0.17.0.2
 License:            BSD3
 License-file:       LICENSE
 Author:             Alberto Ruiz
@@ -16,7 +16,7 @@ Description:        Linear systems, matrix decompositions, and other numerical c
                     Code examples: <http://dis.um.es/~alberto/hmatrix/hmatrix.html>
 
 Category:           Math
-tested-with:        GHC==7.8
+tested-with:        GHC==7.10
 
 cabal-version:      >=1.8
 
diff --git a/packages/base/src/Internal/C/vector-aux.c b/packages/base/src/Internal/C/vector-aux.c
index 9dbf536..1cef27d 100644
--- a/packages/base/src/Internal/C/vector-aux.c
+++ b/packages/base/src/Internal/C/vector-aux.c
@@ -945,6 +945,8 @@ int vectorScan(char * file, int* n, double**pp){
 /* Windows use thread-safe random
    See: http://stackoverflow.com/questions/143108/is-windows-rand-s-thread-safe
 */
+#if defined (__APPLE__) || (__FreeBSD__)
+
 inline double urandom() {
     /* the probalility of matching will be theoretically p^3(in fact, it is not)
        p is matching probalility of random().
@@ -959,6 +961,22 @@ inline double urandom() {
     return (double)nrand48(state) / (double)max_random;
 }
 
+#else
+
+#define _CRT_RAND_S
+inline double urandom() {
+    unsigned int number;
+    errno_t err;
+    err = rand_s(&number);
+    if (err!=0) {
+        printf("something wrong\n");
+        return -1;
+    }
+    return (double)number / (double)UINT_MAX;
+}
+
+#endif
+
 double gaussrand(int *phase, double *pV1, double *pV2, double *pS)
 {
         double V1=*pV1, V2=*pV2, S=*pS;
@@ -985,6 +1003,35 @@ double gaussrand(int *phase, double *pV1, double *pV2, double *pS)
 
 }
 
+#if defined(_WIN32) || defined(WIN32)
+
+int random_vector(unsigned int seed, int code, DVEC(r)) {
+    int phase = 0;
+    double V1,V2,S;
+
+    srand(seed);
+
+    int k;
+    switch (code) {
+      case 0: { // uniform
+        for (k=0; k<rn; k++) {
+            rp[k] = urandom();
+        }
+        OK
+      }
+      case 1: { // gaussian
+        for (k=0; k<rn; k++) {
+            rp[k] = gaussrand(&phase,&V1,&V2,&S);
+        }
+        OK
+      }
+
+      default: ERROR(BAD_CODE);
+    }
+}
+
+#else
+
 int random_vector(unsigned int seed, int code, DVEC(r)) {
     int phase = 0;
     double V1,V2,S;
@@ -1010,6 +1057,8 @@ int random_vector(unsigned int seed, int code, DVEC(r)) {
     }
 }
 
+#endif
+
 #else
 
 inline double urandom(struct random_data * buffer) {