Merge pull request #913 from dpfoose/develop

Small change to allow compiling with USE_OPENMP on MSVC
This commit is contained in:
Zhang Xianyi 2016-06-27 10:05:30 -04:00 committed by GitHub
commit 437c7d64f2
1 changed files with 5 additions and 0 deletions

View File

@ -626,9 +626,14 @@ void gotoblas_profile_init(void);
void gotoblas_profile_quit(void);
#ifdef USE_OPENMP
#ifndef C_MSVC
int omp_in_parallel(void);
int omp_get_num_procs(void);
#else
__declspec(dllimport) int __cdecl omp_in_parallel(void);
__declspec(dllimport) int __cdecl omp_get_num_procs(void);
#endif
#else
#ifdef __ELF__
int omp_in_parallel (void) __attribute__ ((weak));
int omp_get_num_procs(void) __attribute__ ((weak));