Commit 3a35a84c authored by Juanma Barranquero's avatar Juanma Barranquero

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.
parent fe0aa820
2010-07-03 Juanma Barranquero <lekktu@gmail.com>
Fix prototype warnings.
* ebrowse.c (match_qualified_namespace_alias):
Pass sym* to find_namespace, not link*.
* emacsclient.c (send_to_emacs, quote_argument): Arg s is HSOCKET.
* sorted-doc.c (qsort_compare): New typedef.
(main): Use it to cast cmpdoc.
2010-07-03 Dan Nicolaescu <dann@ics.uci.edu>
* update-game-score.c: Convert function definitions to standard C.
......
......@@ -2385,7 +2385,7 @@ match_qualified_namespace_alias (void)
{
case IDENT:
tmp = (struct link *) xmalloc (sizeof *cur);
tmp->sym = find_namespace (yytext, cur);
tmp->sym = find_namespace (yytext, cur->sym);
tmp->next = NULL;
if (head)
{
......
......@@ -764,7 +764,7 @@ sock_err_message (char *function_name)
- the buffer is full (but this shouldn't happen)
Otherwise, we just accumulate it. */
void
send_to_emacs (int s, char *data)
send_to_emacs (HSOCKET s, char *data)
{
while (data)
{
......@@ -801,9 +801,9 @@ send_to_emacs (int s, char *data)
any initial -. Change spaces to underscores, too, so that the
return value never contains a space.
Does not change the string. Outputs the result to STREAM. */
Does not change the string. Outputs the result to S. */
void
quote_argument (int s, char *str)
quote_argument (HSOCKET s, char *str)
{
char *copy = (char *) xmalloc (strlen (str) * 2 + 1);
char *p, *q;
......
......@@ -110,6 +110,7 @@ cmpdoc (DOCSTR **a, DOCSTR **b)
return (*a)->type - (*b)->type;
}
typedef int (*qsort_compare) (const void *, const void *);
enum state
{
......@@ -227,7 +228,7 @@ main (void)
/* sort the array by name; within each name, by type */
qsort ((char*)array, cnt, sizeof (DOCSTR*), cmpdoc);
qsort ((char*)array, cnt, sizeof (DOCSTR*), (qsort_compare)cmpdoc);
/* write the output header */
......
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):
......
......@@ -46,7 +46,7 @@ int cost; /* sums up costs */
/* ARGSUSED */
int
evalcost (c)
char c;
int c;
{
cost++;
return c;
......
......@@ -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))
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment