Mercurial > emacs
changeset 109145:d0090a8b66c3
Convert function definitions and declarations to standard C.
* src/vm-limit.c (memory_warnings):
* src/keyboard.c (modify_event_symbol):
* src/floatfns.c (rounding_driver, ceiling2, floor2, truncate2)
(round2, emacs_rint):
* src/process.c (send_process, old_sigpipe): Convert function
definitions and declarations to standard C.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 05 Jul 2010 09:29:35 -0700 |
| parents | 7dceae91724c |
| children | 6b22e0739484 |
| files | src/ChangeLog src/floatfns.c src/keyboard.c src/process.c src/vm-limit.c |
| diffstat | 5 files changed, 26 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Jul 05 12:36:06 2010 +0200 +++ b/src/ChangeLog Mon Jul 05 09:29:35 2010 -0700 @@ -1,5 +1,13 @@ 2010-07-05 Dan Nicolaescu <dann@ics.uci.edu> - Juanma Barranquero <lekktu@gmail.com> + + * vm-limit.c (memory_warnings): + * keyboard.c (modify_event_symbol): + * floatfns.c (rounding_driver, ceiling2, floor2, truncate2) + (round2, emacs_rint): + * process.c (send_process, old_sigpipe): Convert function + definitions and declarations to standard C. + +2010-07-05 Juanma Barranquero <lekktu@gmail.com> * buffer.c, cm.c, eval.c, keyboard.c, process.c, term.c, vm-limit.c, * xdisp.c: Convert function definitions to standard C.
--- a/src/floatfns.c Mon Jul 05 12:36:06 2010 +0200 +++ b/src/floatfns.c Mon Jul 05 09:29:35 2010 -0700 @@ -70,7 +70,7 @@ /* This declaration is omitted on some systems, like Ultrix. */ #if !defined (HPUX) && defined (HAVE_LOGB) && !defined (logb) -extern double logb (); +extern double logb (double); #endif /* not HPUX and HAVE_LOGB and no logb macro */ #if defined(DOMAIN) && defined(SING) && defined(OVERFLOW) @@ -778,11 +778,10 @@ /* the rounding functions */ static Lisp_Object -rounding_driver (arg, divisor, double_round, int_round2, name) - register Lisp_Object arg, divisor; - double (*double_round) (); - EMACS_INT (*int_round2) (); - char *name; +rounding_driver (Lisp_Object arg, Lisp_Object divisor, + double (*double_round) (double), + EMACS_INT (*int_round2) (EMACS_INT, EMACS_INT), + char *name) { CHECK_NUMBER_OR_FLOAT (arg); @@ -832,8 +831,7 @@ integer functions. */ static EMACS_INT -ceiling2 (i1, i2) - EMACS_INT i1, i2; +ceiling2 (EMACS_INT i1, EMACS_INT i2) { return (i2 < 0 ? (i1 < 0 ? ((-1 - i1) / -i2) + 1 : - (i1 / -i2)) @@ -841,8 +839,7 @@ } static EMACS_INT -floor2 (i1, i2) - EMACS_INT i1, i2; +floor2 (EMACS_INT i1, EMACS_INT i2) { return (i2 < 0 ? (i1 <= 0 ? -i1 / -i2 : -1 - ((i1 - 1) / -i2)) @@ -850,8 +847,7 @@ } static EMACS_INT -truncate2 (i1, i2) - EMACS_INT i1, i2; +truncate2 (EMACS_INT i1, EMACS_INT i2) { return (i2 < 0 ? (i1 < 0 ? -i1 / -i2 : - (i1 / -i2)) @@ -859,8 +855,7 @@ } static EMACS_INT -round2 (i1, i2) - EMACS_INT i1, i2; +round2 (EMACS_INT i1, EMACS_INT i2) { /* The C language's division operator gives us one remainder R, but we want the remainder R1 on the other side of 0 if R1 is closer @@ -880,16 +875,14 @@ #define emacs_rint rint #else static double -emacs_rint (d) - double d; +emacs_rint (double d) { return floor (d + 0.5); } #endif static double -double_identity (d) - double d; +double_identity (double d) { return d; }
--- a/src/keyboard.c Mon Jul 05 12:36:06 2010 +0200 +++ b/src/keyboard.c Mon Jul 05 09:29:35 2010 -0700 @@ -528,8 +528,6 @@ extern Lisp_Object Vhistory_length, Vtranslation_table_for_input; -extern char *x_get_keysym_name (); - static void record_menu_key (Lisp_Object c); static int echo_length (void); @@ -611,7 +609,7 @@ #define READABLE_EVENTS_IGNORE_SQUEEZABLES (1 << 2) /* Function for init_keyboard to call with no args (if nonzero). */ -void (*keyboard_init_hook) (); +void (*keyboard_init_hook) (void); static int read_avail_input (int); static void get_input_pending (int *, int); @@ -6583,6 +6581,7 @@ #ifdef HAVE_WINDOW_SYSTEM if (NILP (value)) { + extern char *x_get_keysym_name (KeySym keysym); char *name = x_get_keysym_name (symbol_num); if (name) value = intern (name);
--- a/src/process.c Mon Jul 05 12:36:06 2010 +0200 +++ b/src/process.c Mon Jul 05 09:29:35 2010 -0700 @@ -182,7 +182,7 @@ #include "syswait.h" -extern char *get_operating_system_release (); +extern char *get_operating_system_release (void); /* Serial processes require termios or Windows. */ #if defined (HAVE_TERMIOS) || defined (WINDOWSNT) @@ -5606,7 +5606,7 @@ int rv; struct coding_system *coding; struct gcpro gcpro1; - SIGTYPE (*volatile old_sigpipe) (); + SIGTYPE (*volatile old_sigpipe) (int); GCPRO1 (object); @@ -5719,7 +5719,7 @@ while (this > 0) { int outfd = p->outfd; - old_sigpipe = (SIGTYPE (*) ()) signal (SIGPIPE, send_process_trap); + old_sigpipe = (SIGTYPE (*) (int)) signal (SIGPIPE, send_process_trap); #ifdef DATAGRAM_SOCKETS if (DATAGRAM_CHAN_P (outfd)) {
--- a/src/vm-limit.c Mon Jul 05 12:36:06 2010 +0200 +++ b/src/vm-limit.c Mon Jul 05 09:29:35 2010 -0700 @@ -251,7 +251,7 @@ void memory_warnings (POINTER start, void (*warnfun) (char *)) { - extern void (* __after_morecore_hook) (); /* From gmalloc.c */ + extern void (* __after_morecore_hook) (void); /* From gmalloc.c */ if (start) data_space_start = start;