This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[Janitor] Remove ADD_MISSING_EXTERN_C
- From: Andreas Jaeger <aj at suse dot de>
- To: gcc-patches at gcc dot gnu dot org
- Date: Fri, 30 May 2003 20:15:24 +0200
- Subject: [Janitor] Remove ADD_MISSING_EXTERN_C
This removes ADD_MISSING_EXTERN_C, a grep in the sources revealed:
./fix-header.c:/*#define ADD_MISSING_EXTERN_C 1 */
./fix-header.c:#if ADD_MISSING_EXTERN_C
./fix-header.c:#if ADD_MISSING_EXTERN_C
./fix-header.c:#if ADD_MISSING_EXTERN_C
./fix-header.c:#if ADD_MISSING_EXTERN_C
./fix-header.c:#if ADD_MISSING_EXTERN_C
./fix-header.c:#if ADD_MISSING_EXTERN_C
./FSFChangeLog.10: using #ifdef ADD_MISSING_EXTERN_C instead of #if 0.
Ok to commit if bootstrap passes on i686-linux-gnu?
Andreas
2003-05-30 Andreas Jaeger <aj@suse.de>
* fix-header.c: Remove ADD_MISSING_EXTERN_C dependend variables.
(write_lbrac): Remove ADD_MISSING_EXTERN_C dependend code.
(recognized_function): Likewise.
(read_scan_file): Likewise.
============================================================
Index: gcc/fix-header.c
--- gcc/fix-header.c 20 May 2003 01:49:12 -0000 1.97
+++ gcc/fix-header.c 30 May 2003 18:15:03 -0000
@@ -89,10 +89,6 @@ int verbose = 0;
int partial_count = 0;
int warnings = 0;
-/* We no longer need to add extern "C", because cpp implicitly
- forces the standard include files to be treated as C. */
-/*#define ADD_MISSING_EXTERN_C 1 */
-
#if ADD_MISSING_EXTERN_C
int missing_extern_C_count = 0;
#endif
@@ -415,11 +411,6 @@ int required_other = 0;
static void
write_lbrac ()
{
-#if ADD_MISSING_EXTERN_C
- if (missing_extern_C_count + required_unseen_count > 0)
- fprintf (outf, "#ifdef __cplusplus\nextern \"C\" {\n#endif\n");
-#endif
-
if (partial_count)
{
fprintf (outf, "#ifndef _PARAMS\n");
@@ -527,10 +518,6 @@ recognized_function (fname, line, kind,
struct partial_proto *partial;
int i;
struct fn_decl *fn;
-#if ADD_MISSING_EXTERN_C
- if (kind == 'f')
- missing_extern_C_count++;
-#endif
fn = lookup_std_proto ((const char *) NODE_NAME (fname->val.node),
NODE_LEN (fname->val.node));
@@ -734,11 +721,7 @@ read_scan_file (in_fname, argc, argv)
}
}
- if (required_unseen_count + partial_count + required_other
-#if ADD_MISSING_EXTERN_C
- + missing_extern_C_count
-#endif
- == 0)
+ if (required_unseen_count + partial_count + required_other == 0)
{
if (verbose)
fprintf (stderr, "%s: OK, nothing needs to be done.\n", inc_filename);
@@ -754,12 +737,6 @@ read_scan_file (in_fname, argc, argv)
if (partial_count)
fprintf (stderr, "%s: %d non-prototype function declarations.\n",
inc_filename, partial_count);
-#if ADD_MISSING_EXTERN_C
- if (missing_extern_C_count)
- fprintf (stderr,
- "%s: %d declarations not protected by extern \"C\".\n",
- inc_filename, missing_extern_C_count);
-#endif
}
}
@@ -891,11 +868,6 @@ write_rbrac ()
break;
}
-
-#if ADD_MISSING_EXTERN_C
- if (missing_extern_C_count + required_unseen_count > 0)
- fprintf (outf, "#ifdef __cplusplus\n}\n#endif\n");
-#endif
}
/* Returns 1 iff the file is properly protected from multiple inclusion:
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.inka.de
http://www.suse.de/~aj