From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 28 Nov 1999 10:16:33 +0000 (+0000)
Subject: (synchronize_locale): Avoid compiler warnings about
X-Git-Tag: emacs-pretest-21.0.90~5948
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=59c65f1e9fa57f037276b70790b7e2ed0a0b0bce;p=emacs.git

(synchronize_locale): Avoid compiler warnings about
pointer type mismatch.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 8083e880d6a..6c1fe1bcdbb 100644
--- 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 91b0c773645..cb08e2f4413 100644
--- 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)
 			    : ""));
     }
 }