From 623a9f45e729d426d51a1a927dab500db337cfa0 Mon Sep 17 00:00:00 2001 From: xoviat Date: Fri, 26 Jan 2018 15:10:27 -0600 Subject: [PATCH] Rename OPENBLAS_FAILED --- ctest/c_xerbla.c | 2 +- ctest/cblas_test.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ctest/c_xerbla.c b/ctest/c_xerbla.c index 9c5357653..91d07e047 100644 --- a/ctest/c_xerbla.c +++ b/ctest/c_xerbla.c @@ -81,7 +81,7 @@ void cblas_xerbla(blasint info, char *rout, char *form, ...) printf("***** XERBLA WAS CALLED WITH INFO = %d INSTEAD OF %d in %s *******\n",info, cblas_info, rout); cblas_lerr = PASSED; cblas_ok = FALSE; - } else cblas_lerr = FAILED; + } else cblas_lerr = OPENBLAS_FAILED; } #ifdef F77_Char diff --git a/ctest/cblas_test.h b/ctest/cblas_test.h index 3eeb46ac2..5dd75c6d9 100644 --- a/ctest/cblas_test.h +++ b/ctest/cblas_test.h @@ -15,7 +15,9 @@ #define TEST_ROW_MJR 1 #define FALSE 0 -#define FAILED 0 + +/* Needed because failed is already defined on MSVC */ +#define OPENBLAS_FAILED 0 #define TEST_COL_MJR 0 #define INVALID -1