diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2010-07-03 09:44:17 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-07-03 09:44:17 +0200 |
| commit | 3a35a84c9389928a21056f50160ccd1cfca11b9e (patch) | |
| tree | 92bd1639d1ff3ec28e6e8ac39274936c71cbcbc7 /lib-src | |
| parent | fe0aa8207634fd7189868855688265f6476889fe (diff) | |
| download | emacs-3a35a84c9389928a21056f50160ccd1cfca11b9e.tar.gz | |
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.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 12 | ||||
| -rw-r--r-- | lib-src/ebrowse.c | 2 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 6 | ||||
| -rw-r--r-- | lib-src/sorted-doc.c | 3 |
4 files changed, 18 insertions, 5 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f9f43ad41e6..e8bb82f749c 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,15 @@ +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. diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index 2f122cbc21d..bb3456f84e8 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.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) { diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index d96925d2a3c..cb8a4ebcaf8 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -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; diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c index 828e8db9a0b..2c138dc348c 100644 --- a/lib-src/sorted-doc.c +++ b/lib-src/sorted-doc.c @@ -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 */ |