Browse Source
Merge pull request #1556 from WestAlgo/develop
move _Atomic define to common.h
tags/v0.3.0^2
Zhang Xianyi
GitHub
7 years ago
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
6 additions and
6 deletions
-
common.h
-
driver/others/blas_server_omp.c
|
|
@@ -649,6 +649,12 @@ int omp_get_num_procs(void); |
|
|
|
__declspec(dllimport) int __cdecl omp_in_parallel(void); |
|
|
|
__declspec(dllimport) int __cdecl omp_get_num_procs(void); |
|
|
|
#endif |
|
|
|
#if (__STDC_VERSION__ >= 201112L) |
|
|
|
#ifndef _Atomic |
|
|
|
#define _Atomic volatile |
|
|
|
#endif |
|
|
|
#include <stdatomic.h> |
|
|
|
#endif |
|
|
|
#else |
|
|
|
#ifdef __ELF__ |
|
|
|
int omp_in_parallel (void) __attribute__ ((weak)); |
|
|
|
|
|
@@ -36,12 +36,6 @@ |
|
|
|
/* or implied, of The University of Texas at Austin. */ |
|
|
|
/*********************************************************************/ |
|
|
|
|
|
|
|
#if __STDC_VERSION__ >= 201112L |
|
|
|
#ifndef _Atomic |
|
|
|
#define _Atomic volatile |
|
|
|
#endif |
|
|
|
#include <stdatomic.h> |
|
|
|
#endif |
|
|
|
#include <stdbool.h> |
|
|
|
#include <stdio.h> |
|
|
|
#include <stdlib.h> |
|
|
|