diff options
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/b2m.c | 9 | ||||
| -rw-r--r-- | lib-src/make-docfile.c | 6 | ||||
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/blockinput.h | 2 | ||||
| -rw-r--r-- | src/cm.h | 2 | ||||
| -rw-r--r-- | src/coding.h | 2 | ||||
| -rw-r--r-- | src/lisp.h | 2 | ||||
| -rw-r--r-- | src/syssignal.h | 2 | ||||
| -rw-r--r-- | src/term.c | 4 |
10 files changed, 30 insertions, 14 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 4ef56c976cf..32da17388f3 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2010-07-02 Dan Nicolaescu <dann@ics.uci.edu> + + * make-docfile.c (xmalloc, xrealloc, concat, readline, fatal): + * b2m.c (scan_file, scan_lisp_file, scan_c_file): Convert to + standard C prototypes. + 2010-07-02 Jan Djärv <jan.h.d@swipnet.se> * ebrowse.c: Remove P_ and __P. diff --git a/lib-src/b2m.c b/lib-src/b2m.c index 7de48e6a522..2741a984093 100644 --- a/lib-src/b2m.c +++ b/lib-src/b2m.c @@ -66,10 +66,11 @@ struct linebuffer extern char *strtok(); -long *xmalloc (), *xrealloc (); -char *concat (); -long readline (); -void fatal (); +long *xmalloc (unsigned int size); +long *xrealloc (char *ptr, unsigned int size); +char *concat (char *s1, char *s2, char *s3); +long readline (struct linebuffer *linebuffer, register FILE *stream); +void fatal (char *message); /* * xnew -- allocate storage. SYNOPSIS: Type *xnew (int n, Type); diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index eb15342ca5b..973c7e31f70 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c @@ -67,9 +67,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP) #endif -int scan_file (); -int scan_lisp_file (); -int scan_c_file (); +int scan_file (char *filename); +int scan_lisp_file (char *filename, char *mode); +int scan_c_file (char *filename, char *mode); #ifdef MSDOS /* s/msdos.h defines this as sys_chdir, but we're not linking with the diff --git a/src/ChangeLog b/src/ChangeLog index ae024da468d..ee347e86a51 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2010-07-02 Dan Nicolaescu <dann@ics.uci.edu> + + * term.c (term_clear_mouse_face, Fidentity): + * syssignal.h (signal_handler_t): + * lisp.h (memory_warnings): + * coding.h (preferred_coding_system): + * cm.h (evalcost): + * blockinput.h (reinvoke_input_signal): Convert to standard C prototypes. + 2010-07-02 Eli Zaretskii <eliz@gnu.org> * dosfns.h (msdos_stdcolor_idx, msdos_stdcolor_name): Remove P_ diff --git a/src/blockinput.h b/src/blockinput.h index 890adcbcd86..99c8274fc60 100644 --- a/src/blockinput.h +++ b/src/blockinput.h @@ -123,7 +123,7 @@ extern int pending_atimers; /* Defined in keyboard.c */ /* Don't use a prototype here; it causes trouble in some files. */ -extern void reinvoke_input_signal (); +extern void reinvoke_input_signal (void); #endif /* EMACS_BLOCKINPUT_H */ @@ -158,7 +158,7 @@ extern char PC; /* Pad character */ #define losecursor(tty) (curX(tty) = -1, curY(tty) = -1) extern int cost; -extern int evalcost (); +extern int evalcost (char c); #define emacs_tputs(tty, str, affcnt, putc) (current_tty = (tty), tputs (str, affcnt, putc)) diff --git a/src/coding.h b/src/coding.h index 156ead91ed2..75ed84bef71 100644 --- a/src/coding.h +++ b/src/coding.h @@ -753,7 +753,7 @@ extern void encode_coding_object (struct coding_system *, } while (0) -extern Lisp_Object preferred_coding_system (); +extern Lisp_Object preferred_coding_system (void); extern Lisp_Object Qutf_8, Qutf_8_emacs; diff --git a/src/lisp.h b/src/lisp.h index 2b25e153d30..8f69b92d54f 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2668,7 +2668,7 @@ extern int pos_visible_p (struct window *, int, int *, extern void syms_of_xsettings (void); /* Defined in vm-limit.c. */ -extern void memory_warnings (POINTER_TYPE *, void (*warnfun) ()); +extern void memory_warnings (POINTER_TYPE *, void (*warnfun) (const char*)); /* Defined in alloc.c */ extern void check_pure_size (void); diff --git a/src/syssignal.h b/src/syssignal.h index 35252c4b958..e3765add425 100644 --- a/src/syssignal.h +++ b/src/syssignal.h @@ -76,7 +76,7 @@ extern sigset_t sys_sigmask (); /* Whether this is what all systems want or not, this is what appears to be assumed in the source, for example data.c:arith_error. */ -typedef RETSIGTYPE (*signal_handler_t) (/*int*/); +typedef RETSIGTYPE (*signal_handler_t) (int); signal_handler_t sys_signal (int signal_number, signal_handler_t action); sigset_t sys_sigblock (sigset_t new_mask); diff --git a/src/term.c b/src/term.c index 64e329ec602..275dfa98adc 100644 --- a/src/term.c +++ b/src/term.c @@ -187,7 +187,7 @@ extern char *tgetstr (); #ifdef HAVE_GPM #include <sys/fcntl.h> -static void term_clear_mouse_face (); +static void term_clear_mouse_face (void); static void term_mouse_highlight (struct frame *f, int x, int y); /* The device for which we have enabled gpm support (or NULL). */ @@ -1385,7 +1385,7 @@ term_get_fkeys (address, kboard) function key specification, rather than giving the user an error and refusing to run at all on such a terminal. */ - extern Lisp_Object Fidentity (); + extern Lisp_Object Fidentity (Lisp_Object); term_get_fkeys_address = address; term_get_fkeys_kboard = kboard; internal_condition_case (term_get_fkeys_1, Qerror, Fidentity); |