Fix use of gl_lock_t for platforms without any threading.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index b4707ac60acf547dc33e2c68ac0a6d4d8c4ad7f0..362decd9752d5f5a167412234cbbd7cf368c002b 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-21  Bruno Haible  <bruno@clisp.org>
+
+       * msgmerge.c (struct definitions_ty): Use gl_lock_define to declare
+       the findex_init_lock field.
+       (definitions_init): Use gl_lock_init to initialize it, instead of
+       memcpy hack.
+
 2006-10-16  Bruno Haible  <bruno@clisp.org>
 
        Work around automake-1.10 problem described in

diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index 1cf3fb415820b502ce74feba28f479cf7c0326fd..ec4848fa4f7df585a79cb1a7453a616d95ac35f9 100644 (file)
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -619,7 +619,7 @@ struct definitions_ty
   message_fuzzy_index_ty *findex;
   /* A once-only execution guard for the initialization of the fuzzy index.
      Needed for OpenMP.  */
-  gl_lock_t findex_init_lock;
+  gl_lock_define(, findex_init_lock);
   /* The canonical encoding of the compendiums.  */
   const char *canon_charset;
 };
@@ -627,14 +627,12 @@ struct definitions_ty
 static inline void
 definitions_init (definitions_ty *definitions, const char *canon_charset)
 {
-  gl_lock_define_initialized (static, fresh_lock)
-
   definitions->lists = message_list_list_alloc ();
   message_list_list_append (definitions->lists, NULL);
   if (compendiums != NULL)
     message_list_list_append_list (definitions->lists, compendiums);
   definitions->findex = NULL;
-  memcpy (&definitions->findex_init_lock, &fresh_lock, sizeof (gl_lock_t));
+  gl_lock_init (definitions->findex_init_lock);
   definitions->canon_charset = canon_charset;
 }