diff options
author | Dan Nicolaescu <dann@ics.uci.edu> | 2010-07-04 21:52:39 -0700 |
---|---|---|
committer | Dan Nicolaescu <dann@ics.uci.edu> | 2010-07-04 21:52:39 -0700 |
commit | dd4c5104086a55654982112f71c2f69e1e8e0cd1 (patch) | |
tree | e27410ebcc2b0f4399d43b7e05e2519bc4599e43 /src/emacs.c | |
parent | 9c8a2331d427aa8e7b2c7deeba04c76b56ce694c (diff) | |
download | emacs-dd4c5104086a55654982112f71c2f69e1e8e0cd1.tar.gz |
Convert declarations or definitions to standard C.
* src/xsmfns.c (smc_save_yourself_CB, smc_error_handler):
* src/xrdb.c (get_system_name):
* src/window.c (shrink_windows):
* src/syntax.c (forw_comment):
* src/scroll.c (calculate_scrolling, calculate_direct_scrolling)
(ins_del_costs):
* src/mem-limits.h (start_of_data):
* src/lread.c (readevalloop):
* src/gtkutil.c (xg_dialog_response_cb, xg_get_file_with_chooser)
(xg_get_file_with_selection, xg_update_menubar, xg_update_submenu):
* src/frame.c (x_get_focus_frame):
* src/floatfns.c (fmod_float):
* src/fileio.c (choose_write_coding_system):
* src/emacs.c (fatal_error_signal, init_cmdargs, argmatch)
(malloc_initialize_hook, sort_args, synchronize_locale):
* src/doprnt.c (doprnt):
* src/dired.c (compile_pattern):
* src/data.c (fmod_float):
* src/chartab.c (map_sub_char_table, map_sub_char_table_for_charset)
(map_char_table_for_charset):
* src/charset.c (define_charset_internal):
* src/alloc.c (Fgarbage_collect): Convert declarations or definitions
to standard C.
Diffstat (limited to 'src/emacs.c')
-rw-r--r-- | src/emacs.c | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/src/emacs.c b/src/emacs.c index d31a5f16f74..79604413beb 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -157,9 +157,9 @@ int initialized; static data inside glibc's malloc. */ void *malloc_state_ptr; /* From glibc, a routine that returns a copy of the malloc internal state. */ -extern void *malloc_get_state (); +extern void *malloc_get_state (void); /* From glibc, a routine that overwrites the malloc internal state. */ -extern int malloc_set_state (); +extern int malloc_set_state (void*); /* Non-zero if the MALLOC_CHECK_ environment variable was set while dumping. Used to work around a bug in glibc's malloc. */ int malloc_using_checking; @@ -252,8 +252,8 @@ int daemon_pipe[2]; char **initial_argv; int initial_argc; -static void sort_args (); -void syms_of_emacs (); +static void sort_args (int argc, char **argv); +void syms_of_emacs (void); /* MSVC needs each string be shorter than 2048 bytes, so the usage strings below are split to not overflow this limit. */ @@ -374,8 +374,7 @@ pthread_t main_thread; /* Handle bus errors, invalid instruction, etc. */ SIGTYPE -fatal_error_signal (sig) - int sig; +fatal_error_signal (int sig) { SIGNAL_THREAD_CHECK (sig); fatal_error_code = sig; @@ -444,10 +443,7 @@ abort () /* Code for dealing with Lisp access to the Unix command line. */ static void -init_cmdargs (argc, argv, skip_args) - int argc; - char **argv; - int skip_args; +init_cmdargs (int argc, char **argv, int skip_args) { register int i; Lisp_Object name, dir, tem; @@ -644,14 +640,7 @@ void __main () enough information to do it right. */ static int -argmatch (argv, argc, sstr, lstr, minlen, valptr, skipptr) - char **argv; - int argc; - char *sstr; - char *lstr; - int minlen; - char **valptr; - int *skipptr; +argmatch (char **argv, int argc, char *sstr, char *lstr, int minlen, char **valptr, int *skipptr) { char *p = NULL; int arglen; @@ -709,7 +698,7 @@ argmatch (argv, argc, sstr, lstr, minlen, valptr, skipptr) possible using this special hook. */ static void -malloc_initialize_hook () +malloc_initialize_hook (void) { #ifndef USE_CRT_DLL extern char **environ; @@ -747,7 +736,7 @@ malloc_initialize_hook () } } -void (*__malloc_initialize_hook) () = malloc_initialize_hook; +void (*__malloc_initialize_hook) (void) = malloc_initialize_hook; #endif /* DOUG_LEA_MALLOC */ @@ -1928,9 +1917,7 @@ const struct standard_args standard_args[] = than once, eliminate all but one copy of it. */ static void -sort_args (argc, argv) - int argc; - char **argv; +sort_args (int argc, char **argv) { char **new = (char **) xmalloc (sizeof (char *) * argc); /* For each element of argv, @@ -2322,10 +2309,7 @@ fixup_locale () /* Set system locale CATEGORY, with previous locale *PLOCALE, to DESIRED_LOCALE. */ static void -synchronize_locale (category, plocale, desired_locale) - int category; - Lisp_Object *plocale; - Lisp_Object desired_locale; +synchronize_locale (int category, Lisp_Object *plocale, Lisp_Object desired_locale) { if (! EQ (*plocale, desired_locale)) { |