diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-02 10:10:35 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-02 10:10:35 -0700 |
| commit | 1882aa387874f0ac0965fa7bec1c5760dc37e48f (patch) | |
| tree | 27cfcfb9f16c55a0bf84a5c91a5efd20f495ef55 /src/firstfile.c | |
| parent | a411ac43d3667d042fa36361275eccbe9aca80af (diff) | |
* emacs.c, eval.c: Use bool for boolean.
* emacs.c (initialized, inhibit_window_system, running_asynch_code):
(malloc_using_checking) [DOUG_LEA_MALLOC]:
(display_arg) [HAVE_X_WINDOWS || HAVE_NS]:
(noninteractive, no_site_lisp, fatal_error_in_progress, argmatch)
(main, decode_env_path, Fdaemon_initialized):
* eval.c (call_debugger, Finteractive_p, interactive_p):
(unwind_to_catch, Fsignal, wants_debugger, skip_debugger)
(maybe_call_debugger, Fbacktrace):
* process.c (read_process_output, exec_sentinel):
Use bool for booleans.
* emacs.c (shut_down_emacs): Omit unused boolean argument NO_X.
All callers changed.
* eval.c (interactive_p): Omit always-true boolean argument
EXCLUDE_SUBRS_P. All callers changed.
* dispextern.h, lisp.h: Reflect above API changes.
* firstfile.c (dummy): Use the address of 'main', whose signature
won't change, instead of the address of 'initialize', whose
signature just changed from int to bool.
* lisp.h (fatal_error_in_progress): New decl of boolean, moved here ...
* msdos.c (fatal_error_in_progress): ... from here.
* xdisp.c (redisplaying_p): Now a boolean. Set it to 1 instead
of incrementing it.
(redisplay_internal, unwind_redisplay): Simply clear
REDISPLAYING_P when unwinding, instead of saving its previous,
always-false value and then restoring it.
Diffstat (limited to 'src/firstfile.c')
| -rw-r--r-- | src/firstfile.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/firstfile.c b/src/firstfile.c index 84511cfe0a..444fb71b55 100644 --- a/src/firstfile.c +++ b/src/firstfile.c @@ -27,7 +27,6 @@ static char _my_begbss[1]; char * my_begbss_static = _my_begbss; /* Add a dummy reference to ensure emacs.obj is linked in. */ -extern int initialized; -static int * dummy = &initialized; +extern int main (int, char **); +static int (*dummy) (int, char **) = main; #endif - |