diff --git a/driver/level3/level3_gemm3m_thread.c b/driver/level3/level3_gemm3m_thread.c
index f5e5bca1e..4903aa5bd 100644
--- a/driver/level3/level3_gemm3m_thread.c
+++ b/driver/level3/level3_gemm3m_thread.c
@@ -91,7 +91,7 @@
 #endif
 
 typedef struct {
-#if _STDC_VERSION__ >= 201112L  
+#if __STDC_VERSION__ >= 201112L
   _Atomic
 #else
   volatile
diff --git a/driver/level3/level3_syrk_threaded.c b/driver/level3/level3_syrk_threaded.c
index d1c476f00..574f825b0 100644
--- a/driver/level3/level3_syrk_threaded.c
+++ b/driver/level3/level3_syrk_threaded.c
@@ -67,7 +67,7 @@
 #endif
 
 typedef struct {
-#if _STDC_VERSION__ >= 201112L  
+#if __STDC_VERSION__ >= 201112L
 _Atomic
 #else 
   volatile
diff --git a/driver/level3/level3_thread.c b/driver/level3/level3_thread.c
index 47b20f7fa..4ab1ee8cc 100644
--- a/driver/level3/level3_thread.c
+++ b/driver/level3/level3_thread.c
@@ -91,7 +91,7 @@
 #endif
 
 typedef struct {
-#if _STDC_VERSION__ >= 201112L
+#if __STDC_VERSION__ >= 201112L
 _Atomic
 #else  
   volatile
diff --git a/driver/others/blas_server_omp.c b/driver/others/blas_server_omp.c
index 868db3b1d..cc00092cd 100644
--- a/driver/others/blas_server_omp.c
+++ b/driver/others/blas_server_omp.c
@@ -36,7 +36,7 @@
 /* or implied, of The University of Texas at Austin.                 */
 /*********************************************************************/
 
-#if _STDC_VERSION__ >= 201112L
+#if __STDC_VERSION__ >= 201112L
 #ifndef _Atomic
 #define _Atomic volatile
 #endif
@@ -57,7 +57,7 @@
 int blas_server_avail = 0;
 
 static void * blas_thread_buffer[MAX_PARALLEL_NUMBER][MAX_CPU_NUMBER];
-#if _STDC_VERSION__ >= 201112L
+#if __STDC_VERSION__ >= 201112L
 static atomic_bool blas_buffer_inuse[MAX_PARALLEL_NUMBER];
 #else
 static _Bool blas_buffer_inuse[MAX_PARALLEL_NUMBER];
@@ -322,7 +322,7 @@ int exec_blas(BLASLONG num, blas_queue_t *queue){
 
   while(true) {
     for(i=0; i < MAX_PARALLEL_NUMBER; i++) {
-#if _STDC_VERSION__ >= 201112L
+#if __STDC_VERSION__ >= 201112L
       _Bool inuse = false;
       if(atomic_compare_exchange_weak(&blas_buffer_inuse[i], &inuse, true)) {
 #else
@@ -347,7 +347,7 @@ int exec_blas(BLASLONG num, blas_queue_t *queue){
     exec_threads(&queue[i], buf_index);
   }
 
-#if _STDC_VERSION__ >= 201112L
+#if __STDC_VERSION__ >= 201112L
   atomic_store(&blas_buffer_inuse[buf_index], false);
 #else
   blas_buffer_inuse[buf_index] = false;
diff --git a/lapack/getrf/getrf_parallel.c b/lapack/getrf/getrf_parallel.c
index 4e742b994..591ce4a99 100644
--- a/lapack/getrf/getrf_parallel.c
+++ b/lapack/getrf/getrf_parallel.c
@@ -119,7 +119,7 @@ static void inner_basic_thread(blas_arg_t *args, BLASLONG *range_m, BLASLONG *ra
   FLOAT *d = (FLOAT *)args -> b + (k + k * lda) * COMPSIZE;
   FLOAT *sbb = sb;
 
-#if _STDC_VERSION__ >= 201112L  
+#if __STDC_VERSION__ >= 201112L
   _Atomic BLASLONG *flag = (_Atomic BLASLONG *)args -> d;
 #else
   volatile BLASLONG *flag = (volatile BLASLONG *)args -> d;
@@ -201,7 +201,7 @@ static void inner_basic_thread(blas_arg_t *args, BLASLONG *range_m, BLASLONG *ra
 /* Non blocking implementation */
 
 typedef struct {
-#if _STDC_VERSION__ >= 201112L  
+#if __STDC_VERSION__ >= 201112L
   _Atomic
 #else
   volatile
@@ -246,7 +246,7 @@ static int inner_advanced_thread(blas_arg_t *args, BLASLONG *range_m, BLASLONG *
 
   blasint *ipiv = (blasint *)args -> c;
   BLASLONG jw;
-#if _STDC_VERSION__ >= 201112L  
+#if __STDC_VERSION__ >= 201112L
   _Atomic BLASLONG *flag = (_Atomic BLASLONG *)args -> d;
 #else
   volatile BLASLONG *flag = (volatile BLASLONG *)args -> d;
@@ -452,7 +452,7 @@ blasint CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa,
 #ifdef _MSC_VER
   BLASLONG flag[MAX_CPU_NUMBER * CACHE_LINE_SIZE];
 #else
-#if _STDC_VERSION__ >= 201112L  
+#if __STDC_VERSION__ >= 201112L
   _Atomic
 #else  
   volatile
@@ -728,7 +728,7 @@ blasint CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa,
   BLASLONG range[MAX_CPU_NUMBER + 1];
 
   BLASLONG width, nn, num_cpu;
-#if _STDC_VERSION__ >= 201112L  
+#if __STDC_VERSION__ >= 201112L
   _Atomic
 #else  
   volatile
diff --git a/lapack/getrf/potrf_parallel.c b/lapack/getrf/potrf_parallel.c
index 104022dd9..c2fee6bd1 100644
--- a/lapack/getrf/potrf_parallel.c
+++ b/lapack/getrf/potrf_parallel.c
@@ -101,7 +101,7 @@ static FLOAT dm1 = -1.;
 #endif
 
 typedef struct {
-#if _STDC_VERSION__ >= 201112L  
+#if __STDC_VERSION__ >= 201112L
   _Atomic 
 #else
   volatile