merge from gcc

This commit is contained in:
DJ Delorie 2007-04-11 20:01:26 +00:00
parent db2e3e2ee2
commit 8535fe175a
3 changed files with 11 additions and 11 deletions

View File

@ -1,3 +1,8 @@
2007-04-11 Thomas Neumann tneumann@users.sourceforge.net
* argv.c: Use ANSI C declarations.
* make-relative-prefix.c: Likewise.
2007-04-06 Joel Brobecker <brobecker@adacore.com>
* filename_cmp.c (filename_cmp): Improve documentation.

View File

@ -312,9 +312,7 @@ operating system to free the memory when the program exits.
*/
void
expandargv (argcp, argvp)
int *argcp;
char ***argvp;
expandargv (int *argcp, char ***argvp)
{
/* The argument we are currently processing. */
int i = 0;

View File

@ -400,10 +400,8 @@ make_relative_prefix_1 (const char *progname, const char *bin_prefix,
from somwhere else. */
char *
make_relative_prefix (progname, bin_prefix, prefix)
const char *progname;
const char *bin_prefix;
const char *prefix;
make_relative_prefix (const char *progname, const char *bin_prefix,
const char *prefix)
{
return make_relative_prefix_1 (progname, bin_prefix, prefix, 1);
}
@ -414,10 +412,9 @@ make_relative_prefix (progname, bin_prefix, prefix)
installation is patched together with soft links. */
char *
make_relative_prefix_ignore_links (progname, bin_prefix, prefix)
const char *progname;
const char *bin_prefix;
const char *prefix;
make_relative_prefix_ignore_links (const char *progname,
const char *bin_prefix,
const char *prefix)
{
return make_relative_prefix_1 (progname, bin_prefix, prefix, 0);
}