[prev in list] [next in list] [prev in thread] [next in thread] 

List:       graphicsmagick-commit
Subject:    [GM-commit] GraphicsMagick: Fix compilation when OpenMP not
From:       GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date:       2011-11-26 22:11:53
Message-ID: hg.6466bd711bd9.1322345513.-1602079902 () blade ! simplesystems ! org
[Download RAW message or body]

changeset 6466bd711bd9 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=6466bd711bd9
summary: Fix compilation when OpenMP not available.

diffstat:

 magick/command.c |  13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r 5de1dc40c20b -r 6466bd711bd9 magick/command.c
--- a/magick/command.c	Sat Nov 26 15:58:53 2011 -0600
+++ b/magick/command.c	Sat Nov 26 16:11:48 2011 -0600
@@ -1607,8 +1607,10 @@
       TimerInfo
 	timer;
 
+#if defined(HAVE_OPENMP)
       if (thread_bench)
 	(void) SetMagickResourceLimit(ThreadsResource,current_threads);
+#endif /* HAVE_OPENMP */
 
       (void) strlcpy(client_name,GetClientName(),sizeof(client_name));
       GetTimerInfo(&timer);
@@ -1745,8 +1747,17 @@
 		       threads_limit,iteration,user_time,elapsed_time,rate_total,rate_cpu);
 	(void) fflush(stderr);
       }
+#if defined(HAVE_OPENMP)
       current_threads++;
-    } while((thread_bench) && (current_threads <= max_threads));
+#endif
+    }
+  while (
+#if defined(HAVE_OPENMP)
+	 (thread_bench) && (current_threads <= max_threads)
+#else
+	 (0)
+#endif
+	 );
 
   return status;
 }

------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure 
contains a definitive record of customers, application performance, 
security threats, fraudulent activity, and more. Splunk takes this 
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Graphicsmagick-commit mailing list
Graphicsmagick-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit
[prev in list] [next in list] [prev in thread] [next in thread]