Fix INTERFACE64 definitions for 64bit Windows

lapack-netlib/SRC/DEPRECATED/cgegs.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/cgegv.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/cgelsx.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/cgeqpf.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/cggsvd.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/cggsvp.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/clahrd.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/clatzm.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/ctzrqf.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/dgegs.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/dgegv.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/dgelsx.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/dgeqpf.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/dggsvd.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/dggsvp.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/dlahrd.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/dlatzm.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/dtzrqf.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/sgegs.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/sgegv.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/sgelsx.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/sgeqpf.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/sggsvd.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/sggsvp.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/slahrd.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/slatzm.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/stzrqf.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/zgegs.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/zgegv.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/zgelsx.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/zgeqpf.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/zggsvd.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/zggsvp.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/zlahrd.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/zlatzm.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/DEPRECATED/ztzrqf.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cbbcsd.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cbdsqr.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgbbrd.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgbcon.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgbequ.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgbequb.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgbrfs.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgbrfsx.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgbsv.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgbsvx.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgbsvxx.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgbtf2.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgbtrf.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgbtrs.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgebak.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgebal.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgebd2.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgebrd.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgecon.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeequ.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeequb.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgees.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeesx.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeev.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeevx.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgehd2.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgehrd.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgejsv.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgelq.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgelq2.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgelqf.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgelqt.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgelqt3.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgels.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgelsd.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgelss.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgelsy.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgemlq.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgemlqt.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgemqr.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgemqrt.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeql2.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeqlf.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeqp3.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeqr.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeqr2.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeqr2p.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeqrf.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeqrfp.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeqrt.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeqrt2.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgeqrt3.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgerfs.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgerfsx.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgerq2.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgerqf.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgesc2.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgesdd.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgesv.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgesvd.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgesvdq.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgesvdx.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgesvj.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)

lapack-netlib/SRC/cgesvx.c

@@ -19,7 +19,7 @@
 #undef I
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -29,7 +29,7 @@ typedef unsigned long BLASULONG;
 
 #ifdef LAPACK_ILP64
 typedef BLASLONG blasint;
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(_WIN64)
 #define blasabs(x) llabs(x)
 #else
 #define blasabs(x) labs(x)