changeset 109108:5842e8fabe06

Convert some prototypes to standard C. * lib-src/make-docfile.c (xmalloc, xrealloc, concat, readline, fatal): * lib-src/b2m.c (scan_file, scan_lisp_file, scan_c_file): Convert to standard C prototypes. * src/term.c (term_clear_mouse_face, Fidentity): * src/syssignal.h (signal_handler_t): * src/lisp.h (memory_warnings): * src/coding.h (preferred_coding_system): * src/cm.h (evalcost): * src/blockinput.h (reinvoke_input_signal): Convert to standard C prototypes.
author Dan Nicolaescu <dann@ics.uci.edu>
date Fri, 02 Jul 2010 15:18:28 -0700
parents 06fb882320aa
children d5e4b1b34988
files lib-src/ChangeLog lib-src/b2m.c lib-src/make-docfile.c src/ChangeLog src/blockinput.h src/cm.h src/coding.h src/lisp.h src/syssignal.h src/term.c
diffstat 10 files changed, 30 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/lib-src/ChangeLog	Fri Jul 02 16:46:22 2010 +0200
+++ b/lib-src/ChangeLog	Fri Jul 02 15:18:28 2010 -0700
@@ -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.
--- a/lib-src/b2m.c	Fri Jul 02 16:46:22 2010 +0200
+++ b/lib-src/b2m.c	Fri Jul 02 15:18:28 2010 -0700
@@ -66,10 +66,11 @@
 
 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);
--- a/lib-src/make-docfile.c	Fri Jul 02 16:46:22 2010 +0200
+++ b/lib-src/make-docfile.c	Fri Jul 02 15:18:28 2010 -0700
@@ -67,9 +67,9 @@
 #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
--- a/src/ChangeLog	Fri Jul 02 16:46:22 2010 +0200
+++ b/src/ChangeLog	Fri Jul 02 15:18:28 2010 -0700
@@ -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_
--- a/src/blockinput.h	Fri Jul 02 16:46:22 2010 +0200
+++ b/src/blockinput.h	Fri Jul 02 15:18:28 2010 -0700
@@ -123,7 +123,7 @@
 
 /* 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 */
 
--- a/src/cm.h	Fri Jul 02 16:46:22 2010 +0200
+++ b/src/cm.h	Fri Jul 02 15:18:28 2010 -0700
@@ -158,7 +158,7 @@
 #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))
 
--- a/src/coding.h	Fri Jul 02 16:46:22 2010 +0200
+++ b/src/coding.h	Fri Jul 02 15:18:28 2010 -0700
@@ -753,7 +753,7 @@
   } while (0)
 
 
-extern Lisp_Object preferred_coding_system ();
+extern Lisp_Object preferred_coding_system (void);
 
 
 extern Lisp_Object Qutf_8, Qutf_8_emacs;
--- a/src/lisp.h	Fri Jul 02 16:46:22 2010 +0200
+++ b/src/lisp.h	Fri Jul 02 15:18:28 2010 -0700
@@ -2668,7 +2668,7 @@
 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);
--- a/src/syssignal.h	Fri Jul 02 16:46:22 2010 +0200
+++ b/src/syssignal.h	Fri Jul 02 15:18:28 2010 -0700
@@ -76,7 +76,7 @@
 
 /* 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);
--- a/src/term.c	Fri Jul 02 16:46:22 2010 +0200
+++ b/src/term.c	Fri Jul 02 15:18:28 2010 -0700
@@ -187,7 +187,7 @@
 #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 @@
      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);