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.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4ef56c976cf781f0635caa0271a2957fc4674277..32da17388f327dbe80eed9e33268c2ee1c6bdcb3 100644 (file)
--- 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 7de48e6a522ec3bb4f7fe8a213ee9b0d70568f11..2741a984093a4114cc877b5107edc5b77179102d 100644 (file)
--- 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 eb15342ca5b1dce22cb04959dd23dc1ce872a8b1..973c7e31f709a85bb98525b233fa235dac3eaa94 100644 (file)
--- 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 ae024da468dba00f45735c9b27bb2abcaf19b0ee..ee347e86a51893e9de84a0af9e0e93608e052d22 100644 (file)
--- 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 890adcbcd862de74f1640c99711db24cc3396f2e..99c8274fc60eb957d76dda34d21564c4964f927e 100644 (file)
--- 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 */
 

diff --git a/src/cm.h b/src/cm.h
index f27f1c83bdb07dd72d71373f1cf856e1ed8a5e1c..0ca4b33dc95ba16b7167bea684cb6aa7b11a53b7 100644 (file)
--- a/src/cm.h
+++ b/src/cm.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 156ead91ed26982996ffac2eea29b788082771ba..75ed84bef710ab43fa3252fb28c2aca1e6e155ca 100644 (file)
--- 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 2b25e153d30cf6d9c33913902d9fcad986cdabb8..8f69b92d54f8ba07cffdd38ce76318d086959b8a 100644 (file)
--- 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 35252c4b958695d15212d7f3c014f866ce0f8007..e3765add4253667f616b0af4158b81cf0d7fd1a3 100644 (file)
--- 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 64e329ec602b4f2477077fe9680c15de874bf4f2..275dfa98adcf327316df2973f71f7a2a57560076 100644 (file)
--- 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);