From: Bruno Haible <bruno@clisp.org>
Date: Tue, 9 Apr 2019 19:09:38 +0000 (+0200)
Subject: msgmerge: Fix crash on 32-bit AIX 7.2.
X-Git-Tag: v0.20~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73bd67763b0689c2826346caff404c574a4cda0e;p=thirdparty%2Fgettext.git

msgmerge: Fix crash on 32-bit AIX 7.2.

* gettext-tools/src/msgmerge.c: Include <omp.h>.
(main): Invoke openmp_init().
---

diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index be45c82e4..2808b5c96 100644
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -28,6 +28,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <locale.h>
+#ifdef _OPENMP
+# include <omp.h>
+#endif
 
 #include <textstyle.h>
 
@@ -459,6 +462,11 @@ There is NO WARRANTY, to the extent permitted by law.\n\
       message_print_style_filepos (filepos_comment_none);
     }
 
+  /* Initialize OpenMP.  */
+  #ifdef _OPENMP
+  openmp_init ();
+  #endif
+
   /* Merge the two files.  */
   result = merge (argv[optind], argv[optind + 1], input_syntax, &def);