Various fixes to avoid C syntax errors during stage 1.
* name-lookup.c (pph_set_global_identifier_bindings): Make
parameter list void.
* pph.h (pph_set_global_identifier_bindings): Likewise.
* pph-core.c (pph_stream_registry_add_name): Fix use of struct
pph_name_stream_map.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/pph@183232
138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/cp/ChangeLog.pph | 8 ++++++++
gcc/cp/name-lookup.c | 2 +-
gcc/cp/pph-core.c | 6 +++---
gcc/cp/pph.h | 10 +++++-----
4 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/gcc/cp/ChangeLog.pph b/gcc/cp/ChangeLog.pph
index b545e05..6d3debe 100644
--- a/gcc/cp/ChangeLog.pph
+++ b/gcc/cp/ChangeLog.pph
@@ -1,5 +1,13 @@
2012-01-16 Diego Novillo <dnovi...@google.com>
+ * name-lookup.c (pph_set_global_identifier_bindings): Make
+ parameter list void.
+ * pph.h (pph_set_global_identifier_bindings): Likewise.
+ * pph-core.c (pph_stream_registry_add_name): Fix use of struct
+ pph_name_stream_map.
+
+2012-01-16 Diego Novillo <dnovi...@google.com>
+
* pph-core.c (pph_stream_register): Move later in the file.
(pph_stream_unregister): Likewise.
(pph_stream_registry_ix_for): Fix comparison to !=.
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index dee4bc2..0d92ebe 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -6112,7 +6112,7 @@ pph_set_chain_identifier_bindings (tree first,
cp_binding_level *bl)
after having read all the PPH files. */
void
-pph_set_global_identifier_bindings ()
+pph_set_global_identifier_bindings (void)
{
cp_binding_level *bl = scope_chain->bindings;
pph_set_chain_identifier_bindings (bl->names, bl);
diff --git a/gcc/cp/pph-core.c b/gcc/cp/pph-core.c
index 5d22c5e..6d34bd0 100644
--- a/gcc/cp/pph-core.c
+++ b/gcc/cp/pph-core.c
@@ -886,7 +886,7 @@ static void
pph_stream_registry_add_name (pph_stream *stream, const char *name)
{
void **slot;
- pph_name_stream_map e;
+ struct pph_name_stream_map e;
/* STREAM should have been registered beforehand. */
gcc_assert (pph_stream_registered_p (stream));
@@ -896,8 +896,8 @@ pph_stream_registry_add_name (pph_stream *stream, const
char *name)
e.ix = pph_stream_registry_ix_for (stream);
slot = htab_find_slot (pph_stream_registry.name_ix, &e, INSERT);
gcc_assert (*slot == NULL);
- *slot = (void *) XNEW (pph_name_stream_map);
- memcpy ((pph_name_stream_map *) *slot, &e, sizeof (e));
+ *slot = (void *) XNEW (struct pph_name_stream_map);
+ memcpy ((struct pph_name_stream_map *) *slot, &e, sizeof (e));
}
diff --git a/gcc/cp/pph.h b/gcc/cp/pph.h
index 7b2e1d3..63acd66 100644
--- a/gcc/cp/pph.h
+++ b/gcc/cp/pph.h
@@ -164,13 +164,13 @@ extern enum pph_record_marker pph_in_record_marker
(pph_stream *stream,
struct binding_table_s;
extern void pph_out_binding_table (pph_stream *, struct binding_table_s *);
extern struct binding_table_s *pph_in_binding_table (pph_stream *);
-extern void pph_set_global_identifier_bindings ();
+extern void pph_set_global_identifier_bindings (void);
/* In pt.c. */
-extern void pph_out_pending_templates_list (pph_stream *stream);
-extern void pph_out_spec_entry_tables (pph_stream *stream);
-extern void pph_in_pending_templates_list (pph_stream *stream);
-extern void pph_in_spec_entry_tables (pph_stream *stream);
+extern void pph_out_pending_templates_list (pph_stream *);
+extern void pph_out_spec_entry_tables (pph_stream *);
+extern void pph_in_pending_templates_list (pph_stream *);
+extern void pph_in_spec_entry_tables (pph_stream *);
/* Inline functions. */
--
1.7.7.3
--
This patch is available for review at http://codereview.appspot.com/5549046
