From: cristy Date: Fri, 20 Jan 2012 14:45:29 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6330 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a62909f5404a9040a94de5c8f141b12a9f3d835;p=imagemagick --- diff --git a/MagickCore/draw-private.h b/MagickCore/draw-private.h index 3fcd5696a..954c862bd 100644 --- a/MagickCore/draw-private.h +++ b/MagickCore/draw-private.h @@ -42,7 +42,7 @@ static inline MagickBooleanType GetFillColor(const DrawInfo *draw_info, status; pattern=draw_info->fill_pattern; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical #endif status=GetOneVirtualPixelInfo(pattern,TileVirtualPixelMethod,x+ @@ -67,7 +67,7 @@ static inline MagickBooleanType GetStrokeColor(const DrawInfo *draw_info, status; pattern=draw_info->stroke_pattern; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical #endif status=GetOneVirtualPixelInfo(pattern,TileVirtualPixelMethod,x+ diff --git a/MagickCore/thread-private.h b/MagickCore/thread-private.h index d27e7c576..6f34e489f 100644 --- a/MagickCore/thread-private.h +++ b/MagickCore/thread-private.h @@ -100,7 +100,7 @@ static inline size_t GetOpenMPMaximumThreads(void) static size_t maximum_threads = 1; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) { ssize_t threads; @@ -115,7 +115,7 @@ static inline size_t GetOpenMPMaximumThreads(void) static inline int GetOpenMPThreadId(void) { -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) return(omp_get_thread_num()); #else return(0); @@ -124,7 +124,7 @@ static inline int GetOpenMPThreadId(void) static inline void SetOpenMPMaximumThreads(const int threads) { -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) omp_set_num_threads(threads); #else (void) threads; @@ -133,7 +133,7 @@ static inline void SetOpenMPMaximumThreads(const int threads) static inline void SetOpenMPNested(const int value) { -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) omp_set_nested(value); #else (void) value;