aboutsummaryrefslogtreecommitdiff
path: root/gcc/cppmain.c
diff options
context:
space:
mode:
authorGeoff Keating <geoffk@cygnus.com>2000-10-29 07:07:20 +0000
committerGeoffrey Keating <geoffk@gcc.gnu.org>2000-10-29 07:07:20 +0000
commit926c56780f0725ea270127d42ac9f5daffeb2a96 (patch)
tree41e02b5b0c1c221b225bef780afa91428da07398 /gcc/cppmain.c
parent69f4cc4b9e763cc09896613a3fdd1659384d9869 (diff)
downloadgcc-926c56780f0725ea270127d42ac9f5daffeb2a96.zip
gcc-926c56780f0725ea270127d42ac9f5daffeb2a96.tar.gz
gcc-926c56780f0725ea270127d42ac9f5daffeb2a96.tar.bz2
cpphash.c (cpp_forall_identifiers): Add context variable for callback routine.
* cpphash.c (cpp_forall_identifiers): Add context variable for callback routine. * cppmain.c (dump_macro): Update to match cpp_forall_identifiers change. (main): Call cpp_forall_identifiers with null context. * cpplib.h (cpp_forall_identifiers): Update prototype. * cppmain.c: Make `parse_in' and `print' static. From-SVN: r37119
Diffstat (limited to 'gcc/cppmain.c')
-rw-r--r--gcc/cppmain.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/gcc/cppmain.c b/gcc/cppmain.c
index fc58f6a..3304c15 100644
--- a/gcc/cppmain.c
+++ b/gcc/cppmain.c
@@ -42,7 +42,7 @@ int main PARAMS ((int, char **));
/* General output routines. */
static void scan_buffer PARAMS ((cpp_reader *));
static int printer_init PARAMS ((cpp_reader *));
-static int dump_macro PARAMS ((cpp_reader *, cpp_hashnode *));
+static int dump_macro PARAMS ((cpp_reader *, cpp_hashnode *, void *));
static void print_line PARAMS ((const char *));
static void maybe_print_line PARAMS ((unsigned int));
@@ -62,8 +62,8 @@ static void cb_def_pragma PARAMS ((cpp_reader *));
static void do_pragma_implementation PARAMS ((cpp_reader *));
const char *progname;
-cpp_reader parse_in;
-struct printer print;
+static cpp_reader parse_in;
+static struct printer print;
int
main (argc, argv)
@@ -143,7 +143,7 @@ main (argc, argv)
/* -dM command line option. */
if (CPP_OPTION (pfile, dump_macros) == dump_only)
- cpp_forall_identifiers (pfile, dump_macro);
+ cpp_forall_identifiers (pfile, dump_macro, NULL);
cpp_finish (pfile);
cpp_cleanup (pfile);
@@ -429,9 +429,10 @@ do_pragma_implementation (pfile)
/* Dump out the hash table. */
static int
-dump_macro (pfile, node)
+dump_macro (pfile, node, v)
cpp_reader *pfile;
cpp_hashnode *node;
+ void *v ATTRIBUTE_UNUSED;
{
if (node->type == NT_MACRO && !(node->flags & NODE_BUILTIN))
{