From 23b283811b727205b3670661f2d52507c62ea7d0 Mon Sep 17 00:00:00 2001 From: aj Date: Wed, 4 Jun 2003 04:50:47 +0000 Subject: [PATCH] * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67421 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 7 +++++++ gcc/fix-header.c | 30 +----------------------------- 2 files changed, 8 insertions(+), 29 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 82c26bc4b38..e3070a3a922 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2003-06-04 Andreas Jaeger + + * 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. + 2003-06-03 Roger Sayle * optabs.c (expand_binop): Optimize complex multiplication for diff --git a/gcc/fix-header.c b/gcc/fix-header.c index 745570c0e32..6f486dea216 100644 --- a/gcc/fix-header.c +++ b/gcc/fix-header.c @@ -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, have_arg_list) 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: -- 2.11.4.GIT