* class.c, gjavah.c, parse.y, verify.c: Don't use PTR.

From-SVN: r61137

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 00b5e50a9fb0910feb7e513004182fa68a606793..4cf5631f697a073033ba2de19d8aaf7e9565aa89 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-09  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * class.c, gjavah.c, parse.y, verify.c: Don't use PTR.
+
 2003-01-09  Geoffrey Keating  <geoffk@apple.com>
 
        Merge from pch-branch:

diff --git a/gcc/java/class.c b/gcc/java/class.c
index 29a3aa7cddb0665528921e1362b33a086a0f3737..c1d88574e935c22b898bc2b46d457d6a3d1f10bc 100644 (file)
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -2314,7 +2314,7 @@ java_treetreehash_new (ht, t)
      htab_t ht;
      tree t;
 {
-  PTR *e;
+  void **e;
   struct treetreehash_entry *tthe;
   hashval_t hv = JAVA_TREEHASHHASH_H (t);
 
@@ -2323,7 +2323,7 @@ java_treetreehash_new (ht, t)
     {
       tthe = (*ht->alloc_f) (1, sizeof (*tthe));
       tthe->key = t;
-      *e = (PTR) tthe;
+      *e = tthe;
     }
   else
     tthe = (struct treetreehash_entry *) *e;

diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index 0c333137c56dd79a8a3e6b44bca917bd1ccb1c67..c800e12ca85526b2974d7e699190df295bff1d34 100644 (file)
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -1128,8 +1128,8 @@ throwable_p (clname)
 
   if (! init_done)
     {
-      PTR *slot;
-      const unsigned char *str;
+      void **slot;
+      unsigned char *str;
 
       /* Self-initializing.  The cost of this really doesn't matter.
         We also don't care about freeing these, either.  */
@@ -1141,11 +1141,11 @@ throwable_p (clname)
       /* Make sure the root classes show up in the tables.  */
       str = xstrdup ("java.lang.Throwable");
       slot = htab_find_slot (throw_hash, str, INSERT);
-      *slot = (PTR) str;
+      *slot = str;
 
       str = xstrdup ("java.lang.Object");
       slot = htab_find_slot (non_throw_hash, str, INSERT);
-      *slot = (PTR) str;
+      *slot = str;
 
       init_done = 1;
     }
@@ -1167,7 +1167,7 @@ throwable_p (clname)
   else
     {
       JCF jcf;
-      PTR *slot;
+      void **slot;
       unsigned char *super, *tmp;
       int super_length = -1;
       const char *classfile_name = find_class (current, strlen (current),

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index c67a42e11f65aa908c95a1543351b945410aa3bd..65a114721191981cccc53cb209adf2f4496654cb 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -326,8 +326,8 @@ static tree build_dot_class_method_invocation (tree);
 static void create_new_parser_context (int);
 static tree maybe_build_class_init_for_field (tree, tree);
 
-static int attach_init_test_initialization_flags (PTR *, PTR);
-static int emit_test_initialization (PTR *, PTR);
+static int attach_init_test_initialization_flags (void **, void *);
+static int emit_test_initialization (void **, void *);
 
 static char *string_convert_int_cst (tree);
 
@@ -2663,11 +2663,11 @@ create_new_parser_context (copy_from_previous)
   new =  (struct parser_ctxt *) ggc_alloc (sizeof (struct parser_ctxt));
   if (copy_from_previous)
     {
-      memcpy ((PTR)new, (PTR)ctxp, sizeof (struct parser_ctxt));
+      memcpy (new, ctxp, sizeof (struct parser_ctxt));
       new->saved_data_ctx = 1;
     }
   else
-    memset ((PTR) new, 0, sizeof (struct parser_ctxt));
+    memset (new, 0, sizeof (struct parser_ctxt));
 
   new->next = ctxp;
   ctxp = new;
@@ -7035,7 +7035,7 @@ register_package (name)
      tree name;
 {
   static htab_t pht;
-  PTR *e;
+  void **e;
 
   if (pht == NULL)
     pht = htab_create (50, htab_hash_pointer, htab_eq_pointer, NULL);
@@ -16191,8 +16191,8 @@ init_src_parse ()
 
 static int
 attach_init_test_initialization_flags (entry, ptr)
-     PTR *entry;
-     PTR ptr;
+     void **entry;
+     void *ptr;
 {
   tree block = (tree)ptr;
   struct treetreehash_entry *ite = (struct treetreehash_entry *) *entry;
@@ -16213,8 +16213,8 @@ attach_init_test_initialization_flags (entry, ptr)
 
 static int
 emit_test_initialization (entry_p, info)
-     PTR *entry_p;
-     PTR info;
+     void **entry_p;
+     void *info;
 {
   tree l = (tree) info;
   tree decl, init;

diff --git a/gcc/java/verify.c b/gcc/java/verify.c
index a21cb83694b42ae29bd132e44abf60af14dea64a..cf502b5ba660d90e09d753fbe3445d4c3a3ee2d8 100644 (file)
--- a/gcc/java/verify.c
+++ b/gcc/java/verify.c
@@ -40,7 +40,7 @@ static void push_pending_label (tree);
 static tree merge_types (tree, tree);
 static const char *check_pending_block (tree);
 static void type_stack_dup (int, int);
-static int start_pc_cmp (const PTR, const PTR);
+static int start_pc_cmp (const void *, const void *);
 static char *pop_argument_types (tree);
 
 extern int stack_pointer;
@@ -351,8 +351,8 @@ struct pc_index
 /* A helper that is used when sorting exception ranges.  */
 static int
 start_pc_cmp (xp, yp)
-     const PTR xp;
-     const PTR yp;
+     const void *xp;
+     const void *yp;
 {
   const struct pc_index *x = (const struct pc_index *) xp;
   const struct pc_index *y = (const struct pc_index *) yp;