Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
c03cd23f
Commit
c03cd23f
authored
Mar 13, 2011
by
Paul Eggert
Browse files
* emacs.c (main): Add casts to avoid warnings
if GCC considers string literals to be constants.
parent
244fc23d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
src/ChangeLog
src/ChangeLog
+2
-0
src/emacs.c
src/emacs.c
+3
-3
No files found.
src/ChangeLog
View file @
c03cd23f
...
@@ -4,6 +4,8 @@
...
@@ -4,6 +4,8 @@
(DEFINE_DUMMY_FUNCTION): New macro.
(DEFINE_DUMMY_FUNCTION): New macro.
(__do_global_ctors, __do_global_ctors_aux, __do_global_dtors, __main):
(__do_global_ctors, __do_global_ctors_aux, __do_global_dtors, __main):
Use it.
Use it.
(main): Add casts to avoid warnings
if GCC considers string literals to be constants.
* lisp.h (fatal_error_signal): Add decl, since it's exported.
* lisp.h (fatal_error_signal): Add decl, since it's exported.
src/emacs.c
View file @
c03cd23f
...
@@ -949,7 +949,7 @@ main (int argc, char **argv)
...
@@ -949,7 +949,7 @@ main (int argc, char **argv)
/* Convert --script to -scriptload, un-skip it, and sort again
/* Convert --script to -scriptload, un-skip it, and sort again
so that it will be handled in proper sequence. */
so that it will be handled in proper sequence. */
/* FIXME broken for --script=FILE - is that supposed to work? */
/* FIXME broken for --script=FILE - is that supposed to work? */
argv
[
skip_args
-
1
]
=
"-scriptload"
;
argv
[
skip_args
-
1
]
=
(
char
*
)
"-scriptload"
;
skip_args
-=
2
;
skip_args
-=
2
;
sort_args
(
argc
,
argv
);
sort_args
(
argc
,
argv
);
}
}
...
@@ -1348,7 +1348,7 @@ main (int argc, char **argv)
...
@@ -1348,7 +1348,7 @@ main (int argc, char **argv)
for
(
j
=
0
;
j
<
count_before
+
1
;
j
++
)
for
(
j
=
0
;
j
<
count_before
+
1
;
j
++
)
new
[
j
]
=
argv
[
j
];
new
[
j
]
=
argv
[
j
];
new
[
count_before
+
1
]
=
"-d"
;
new
[
count_before
+
1
]
=
(
char
*
)
"-d"
;
new
[
count_before
+
2
]
=
displayname
;
new
[
count_before
+
2
]
=
displayname
;
for
(
j
=
count_before
+
2
;
j
<
argc
;
j
++
)
for
(
j
=
count_before
+
2
;
j
<
argc
;
j
++
)
new
[
j
+
1
]
=
argv
[
j
];
new
[
j
+
1
]
=
argv
[
j
];
...
@@ -1358,7 +1358,7 @@ main (int argc, char **argv)
...
@@ -1358,7 +1358,7 @@ main (int argc, char **argv)
/* Change --display to -d, when its arg is separate. */
/* Change --display to -d, when its arg is separate. */
else
if
(
displayname
!=
0
&&
skip_args
>
count_before
else
if
(
displayname
!=
0
&&
skip_args
>
count_before
&&
argv
[
count_before
+
1
][
1
]
==
'-'
)
&&
argv
[
count_before
+
1
][
1
]
==
'-'
)
argv
[
count_before
+
1
]
=
"-d"
;
argv
[
count_before
+
1
]
=
(
char
*
)
"-d"
;
if
(
!
no_site_lisp
)
if
(
!
no_site_lisp
)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment