From a94f2b78482aea0fe826e61349bd857e3797f89f Mon Sep 17 00:00:00 2001 From: Daniel Patrick Foose Date: Tue, 14 Jun 2016 14:37:28 -0400 Subject: [PATCH] Change to allow compiling with USE_OPENMP on MSVC MSVC treats the declaration of omp_in_parallel and omp_get_num_procs without the modifiers __declspec(dllimport) and __cdecl as a redefinition. --- common.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common.h b/common.h index a7342db2c..480174c11 100644 --- a/common.h +++ b/common.h @@ -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));