summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-03-13 22:36:36 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-03-13 22:36:36 -0700
commitc03cd23f455776f4fdf68966f6ac01e99f054d1e (patch)
tree45fbbbb74af200812006ebc83d3d3e5b7db1908e /src/emacs.c
parent244fc23d16bd60d159ee359a2f9eadff8b9fe8d3 (diff)
downloademacs-c03cd23f455776f4fdf68966f6ac01e99f054d1e.tar.gz
* emacs.c (main): Add casts to avoid warnings
if GCC considers string literals to be constants.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 54e59a3f3c8..c49e38f7a67 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -949,7 +949,7 @@ main (int argc, char **argv)
/* Convert --script to -scriptload, un-skip it, and sort again
so that it will be handled in proper sequence. */
/* FIXME broken for --script=FILE - is that supposed to work? */
- argv[skip_args - 1] = "-scriptload";
+ argv[skip_args - 1] = (char *) "-scriptload";
skip_args -= 2;
sort_args (argc, argv);
}
@@ -1348,7 +1348,7 @@ main (int argc, char **argv)
for (j = 0; j < count_before + 1; j++)
new[j] = argv[j];
- new[count_before + 1] = "-d";
+ new[count_before + 1] = (char *) "-d";
new[count_before + 2] = displayname;
for (j = count_before + 2; j <argc; j++)
new[j + 1] = argv[j];
@@ -1358,7 +1358,7 @@ main (int argc, char **argv)
/* Change --display to -d, when its arg is separate. */
else if (displayname != 0 && skip_args > count_before
&& argv[count_before + 1][1] == '-')
- argv[count_before + 1] = "-d";
+ argv[count_before + 1] = (char *) "-d";
if (! no_site_lisp)
{