Fix prototypes.

* src/cm.c (evalcost): Fix arg type.
* src/cm.h (evalcost): Fix prototype.
* src/lisp.h (memory_warnings): Fix prototype.

* lib-src/ebrowse.c (match_qualified_namespace_alias):
  Pass sym* to find_namespace, not link*.
* lib-src/emacsclient.c (send_to_emacs, quote_argument): Arg s is HSOCKET.
* lib-src/sorted-doc.c (qsort_compare): New typedef.
  (main): Use it to cast cmpdoc.

4 files changed, 11 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ee347e86a51..157b91f476e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-03  Juanma Barranquero  <lekktu@gmail.com>
+
+	* lisp.h (memory_warnings): Fix prototype.
+
+	* cm.h (evalcost): Fix prototype.
+
+	* cm.c (evalcost): Fix arg type.
+
 2010-07-02  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* term.c (term_clear_mouse_face, Fidentity):
diff --git a/src/cm.c b/src/cm.c
index 45d6417f61f..d083c8a1be9 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -46,7 +46,7 @@ int cost;		/* sums up costs */
 /* ARGSUSED */
 int
 evalcost (c)
-     char c;
+     int c;
 {
   cost++;
   return c;
diff --git a/src/cm.h b/src/cm.h
index 0ca4b33dc95..0ede5e0cc98 100644
--- 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 (char c);
+extern int evalcost (int c);
 
 #define emacs_tputs(tty, str, affcnt, putc) (current_tty = (tty), tputs (str, affcnt, putc))
 
diff --git a/src/lisp.h b/src/lisp.h
index 8f69b92d54f..2f4f3755ab8 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) (const char*));
+extern void memory_warnings (POINTER_TYPE *, void (*warnfun) (char*));
 
 /* Defined in alloc.c */
 extern void check_pure_size (void);