aboutsummaryrefslogtreecommitdiffstats
path: root/src/emacs.c
diff options
context:
space:
mode:
authorPaul Eggert2011-01-30 14:22:58 -0800
committerPaul Eggert2011-01-30 14:22:58 -0800
commit4eec7f8b2b465c6fc2c09d37d4da2b540f607df0 (patch)
tree9f4e30300e4f96dd3c72f5f435032f8180ce1a6c /src/emacs.c
parentfcabb1a6e66f7e6cf4fe0984c4d5c169f4decd8a (diff)
parent42a5b22fc0201fe98ad8a093c3ab91122ab3a72b (diff)
downloademacs-4eec7f8b2b465c6fc2c09d37d4da2b540f607df0.tar.gz
emacs-4eec7f8b2b465c6fc2c09d37d4da2b540f607df0.zip
Use SSDATA when the context wants char *.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emacs.c b/src/emacs.c
index ae3c318c07f..e696c820298 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -755,8 +755,8 @@ main (int argc, char **argv)
755 } 755 }
756 else 756 else
757 { 757 {
758 version = SDATA (tem); 758 version = SSDATA (tem);
759 copyright = SDATA (tem2); 759 copyright = SSDATA (tem2);
760 } 760 }
761 } 761 }
762 else 762 else
@@ -1988,7 +1988,7 @@ all of which are called before Emacs is actually killed. */)
1988 kill it because we are exiting Emacs deliberately (not crashing). 1988 kill it because we are exiting Emacs deliberately (not crashing).
1989 Do it after shut_down_emacs, which does an auto-save. */ 1989 Do it after shut_down_emacs, which does an auto-save. */
1990 if (STRINGP (Vauto_save_list_file_name)) 1990 if (STRINGP (Vauto_save_list_file_name))
1991 unlink (SDATA (Vauto_save_list_file_name)); 1991 unlink (SSDATA (Vauto_save_list_file_name));
1992 1992
1993 exit (INTEGERP (arg) ? XINT (arg) : EXIT_SUCCESS); 1993 exit (INTEGERP (arg) ? XINT (arg) : EXIT_SUCCESS);
1994} 1994}
@@ -2169,7 +2169,7 @@ You must run Emacs in batch mode in order to dump it. */)
2169#ifdef USE_MMAP_FOR_BUFFERS 2169#ifdef USE_MMAP_FOR_BUFFERS
2170 mmap_set_vars (0); 2170 mmap_set_vars (0);
2171#endif 2171#endif
2172 unexec (SDATA (filename), !NILP (symfile) ? SDATA (symfile) : 0); 2172 unexec (SSDATA (filename), !NILP (symfile) ? SSDATA (symfile) : 0);
2173#ifdef USE_MMAP_FOR_BUFFERS 2173#ifdef USE_MMAP_FOR_BUFFERS
2174 mmap_set_vars (1); 2174 mmap_set_vars (1);
2175#endif 2175#endif