(synchronize_locale): Avoid compiler warnings about

pointer type mismatch.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8083e880d6a8b90fe4080ee1313c267aca5f26f8..6c1fe1bcdbb0a46c2387452025a16e66e98f458f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-28  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * emacs.c (synchronize_locale): Avoid compiler warnings about
+       pointer type mismatch.
+
 1999-11-26  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
 
        * editfns.c (Fdelete_field): Make it noninteractive.  Return nil.

diff --git a/src/emacs.c b/src/emacs.c
index 91b0c773645b4b1b751e497d116777ec38fbf5a5..cb08e2f44134a9b03eae66c16fd6991ac01e0990 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1928,7 +1928,7 @@ synchronize_locale (category, plocale, desired_locale)
     {
       *plocale = desired_locale;
       setlocale (category, (STRINGP (desired_locale)
-                           ? XSTRING (desired_locale)->data
+                           ? (char *)(XSTRING (desired_locale)->data)
                            : ""));
     }
 }