From: Bruno Haible <bruno@clisp.org>
Date: Wed, 29 Oct 2008 02:23:11 +0000 (+0000)
Subject: Avoid running into Sun Workshop 6.2 C compiler bug.
X-Git-Tag: v0.18~295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e649a4ab1e223bfa55c1cf65c56f909f655c4660;p=thirdparty%2Fgettext.git

Avoid running into Sun Workshop 6.2 C compiler bug.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index e1cfad645..3ccaabd41 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-28  Bruno Haible  <bruno@clisp.org>
+
+	* msgmerge.c (match_domain): Remove space between '#' and 'pragma' for
+	OpenMP.
+	Reported by Lamarque Eric <eric.lamarque@free.fr>.
+
 2008-10-04  Bruno Haible  <bruno@clisp.org>
 
 	* plural-distrib.h (struct plural_distribution): New field 'histogram'.
diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index 352c59409..bcab34990 100644
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -1397,9 +1397,11 @@ match_domain (const char *fn1, const char *fn2,
     /* Tell the OpenMP capable compiler to distribute this loop across
        several threads.  The schedule is dynamic, because for some messages
        the loop body can be executed very quickly, whereas for others it takes
-       a long time.  */
+       a long time.
+       Note: The Sun Workshop 6.2 C compiler does not allow a space between
+       '#' and 'pragma'.  */
     #ifdef _OPENMP
-    # pragma omp parallel for schedule(dynamic)
+     #pragma omp parallel for schedule(dynamic)
     #endif
     for (jj = 0; jj < nn; jj++)
       {
@@ -1411,7 +1413,7 @@ match_domain (const char *fn1, const char *fn2,
 	if (!quiet && verbosity_level <= 1 && *processed % DOT_FREQUENCY == 0)
 	  fputc ('.', stderr);
 	#ifdef _OPENMP
-	# pragma omp atomic
+	 #pragma omp atomic
 	#endif
 	(*processed)++;