diff options
author | ache <ache@FreeBSD.org> | 2000-03-19 21:18:09 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 2000-03-19 21:18:09 +0000 |
commit | 2e27cca03ab305c34498fe82bf6fbbdc32ff136d (patch) | |
tree | 57ad5d899b83004fdc0f03ce8593e17904317abd /contrib/libreadline/funmap.c | |
parent | f556f75f097948e646fbe6280de86340d9c61536 (diff) | |
parent | b85a0e54aedf144ea0dff369289bd3fb6f694f5f (diff) | |
download | FreeBSD-src-2e27cca03ab305c34498fe82bf6fbbdc32ff136d.zip FreeBSD-src-2e27cca03ab305c34498fe82bf6fbbdc32ff136d.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r58310,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/libreadline/funmap.c')
-rw-r--r-- | contrib/libreadline/funmap.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/contrib/libreadline/funmap.c b/contrib/libreadline/funmap.c index f6b8628..1f7ba87 100644 --- a/contrib/libreadline/funmap.c +++ b/contrib/libreadline/funmap.c @@ -7,7 +7,7 @@ The GNU Readline Library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 1, or + as published by the Free Software Foundation; either version 2, or (at your option) any later version. The GNU Readline Library is distributed in the hope that it will be @@ -18,15 +18,13 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 675 Mass Ave, Cambridge, MA 02139, USA. */ + 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) # include <config.h> #endif -extern char *xmalloc (), *xrealloc (); - #if !defined (BUFSIZ) #include <stdio.h> #endif /* BUFSIZ */ @@ -40,6 +38,14 @@ extern char *xmalloc (), *xrealloc (); #include "rlconf.h" #include "readline.h" +#include "xmalloc.h" + +#ifdef __STDC__ +typedef int QSFUNC (const void *, const void *); +#else +typedef int QSFUNC (); +#endif + extern int _rl_qsort_string_compare (); FUNMAP **funmap; @@ -240,7 +246,7 @@ rl_funmap_names () result[result_index + 1] = (char *)NULL; } - qsort (result, result_index, sizeof (char *), _rl_qsort_string_compare); + qsort (result, result_index, sizeof (char *), (QSFUNC *)_rl_qsort_string_compare); return (result); } |