Avoid running into Sun Workshop 6.2 C compiler bug.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index e1cfad64560e7ef9bc127520978d5ff21b0f449a..3ccaabd41b5bddc059badf636ec3e09fbe59416f 100644 (file)
--- 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 352c5940955b239637adbe8c9cc47b3d27ee7591..bcab349905b68fee0cf036a031d527e9e8d55f1b 100644 (file)
--- 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)++;