summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-01-22 18:56:06 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-01-22 18:56:06 -0800
commit51b59d794fe1d4a82fcd842b478657cc93f91595 (patch)
tree25e57573403a13f3fe70934b40bf38c0190fd5ed /src/emacs.c
parent9e928ac989c824c376b1ab576a6da69cd86b12c6 (diff)
downloademacs-51b59d794fe1d4a82fcd842b478657cc93f91595.tar.gz
emacs-51b59d794fe1d4a82fcd842b478657cc93f91595.tar.bz2
emacs-51b59d794fe1d4a82fcd842b478657cc93f91595.zip
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 304f87ea90e..70dd76d3a3b 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2205,7 +2205,7 @@ synchronize_locale (int category, Lisp_Object *plocale, Lisp_Object desired_loca
{
*plocale = desired_locale;
setlocale (category, (STRINGP (desired_locale)
- ? (char *) SDATA (desired_locale)
+ ? SSDATA (desired_locale)
: ""));
}
}
@@ -2490,4 +2490,3 @@ libraries; only those already known by Emacs will be loaded. */);
/* Make sure IS_DAEMON starts up as false. */
daemon_pipe[1] = 0;
}
-