diff options
| author | obrien <obrien@FreeBSD.org> | 2000-03-09 10:11:08 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2000-03-09 10:11:08 +0000 |
| commit | 4988cee646c535a31e7d493bb20a50ff8d7e8c0e (patch) | |
| tree | 5ec2a3c43c0ad5b3233b09f0e6b7f2429f298250 /contrib | |
| parent | e89d7fd619cb266ec00a5a8c6a22150fd3ac76e2 (diff) | |
| download | FreeBSD-src-4988cee646c535a31e7d493bb20a50ff8d7e8c0e.zip FreeBSD-src-4988cee646c535a31e7d493bb20a50ff8d7e8c0e.tar.gz | |
Merge conflicts.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gcc/cccp.c | 2 | ||||
| -rw-r--r-- | contrib/gcc/gcc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/gcc/cccp.c b/contrib/gcc/cccp.c index 7a24754..69cd93d 100644 --- a/contrib/gcc/cccp.c +++ b/contrib/gcc/cccp.c @@ -3986,7 +3986,7 @@ handle_directive (ip, op) case '\'': case '\"': { - int backslash_newlines_p; + int backslash_newlines_p = 0; register U_CHAR *bp1 = skip_quoted_string (xp - 1, bp, ip->lineno, diff --git a/contrib/gcc/gcc.c b/contrib/gcc/gcc.c index 1e45505..3128db0 100644 --- a/contrib/gcc/gcc.c +++ b/contrib/gcc/gcc.c @@ -5031,7 +5031,7 @@ main (argc, argv) if (! verbose_flag) { printf ("\nFor bug reporting instructions, please see:\n"); - printf ("<URL:http://www.gnu.org/software/gcc/faq.html#bugreport>.\n"); + printf ("%s.\n", GCCBUGURL); exit (0); } @@ -5224,7 +5224,7 @@ main (argc, argv) if (print_help_list) { printf ("\nFor bug reporting instructions, please see:\n"); - printf ("<URL:http://www.gnu.org/software/gcc/faq.html#bugreport>\n"); + printf ("%s\n", GCCBUGURL); } exit (error_count > 0 ? (signal_count ? 2 : 1) : 0); |
