Rename location accessor macro parameters to silence ARI

The locations patch I recently committed contains macro definitions
such as:

This causes an ARI error to be emitted by the server ("Do not use PTR, ISO C
90 implies `void *'").  While this ARI error is bogus in this context,
it is just easiest to squash the error completely by renaming the macro
parameters.

gdb/ChangeLog

	* location.c (EL_TYPE, EL_LINESPEC, EL_PROBE, EL_ADDRESS)
	(EL_EXPLICIT, EL_STRING): Change macro parameter to "P" to
	silence ARI errors.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 37950b441adf212befa2e3e09b81873947b9a74b..0b604fdfc308f3c49bc04a44ad937b59e9663b3f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-14  Keith Seitz  <keiths@redhat.com>
+
+       * location.c (EL_TYPE, EL_LINESPEC, EL_PROBE, EL_ADDRESS)
+       (EL_EXPLICIT, EL_STRING): Change macro parameter to "P" to
+       silence ARI errors.
+
 2015-08-14  Iain Buclaw  <ibuclaw@gdcproject.org>
 
        * d-exp.y (PrimaryExpression : TypeExp '.' IdentifierExp): Use

diff --git a/gdb/location.c b/gdb/location.c
index 49067b996bd6eb34c4da923c3c8c6502555c5135..626f016455bf95ad53c01bb3ad774d078858f1a3 100644 (file)
--- a/gdb/location.c
+++ b/gdb/location.c
@@ -36,7 +36,7 @@ struct event_location
 {
   /* The type of this breakpoint specification.  */
   enum event_location_type type;
-#define EL_TYPE(PTR) (PTR)->type
+#define EL_TYPE(P) (P)->type
 
   union
   {
@@ -44,22 +44,22 @@ struct event_location
        This representation is used by both "normal" linespecs and
        probes.  */
     char *addr_string;
-#define EL_LINESPEC(PTR) ((PTR)->u.addr_string)
-#define EL_PROBE(PTR) ((PTR)->u.addr_string)
+#define EL_LINESPEC(P) ((P)->u.addr_string)
+#define EL_PROBE(P) ((P)->u.addr_string)
 
     /* An address in the inferior.  */
     CORE_ADDR address;
-#define EL_ADDRESS(PTR) (PTR)->u.address
+#define EL_ADDRESS(P) (P)->u.address
 
     /* An explicit location.  */
     struct explicit_location explicit_loc;
-#define EL_EXPLICIT(PTR) (&((PTR)->u.explicit_loc))
+#define EL_EXPLICIT(P) (&((P)->u.explicit_loc))
   } u;
 
   /* Cached string representation of this location.  This is used, e.g., to
      save stop event locations to file.  Malloc'd.  */
   char *as_string;
-#define EL_STRING(PTR) ((PTR)->as_string)
+#define EL_STRING(P) ((P)->as_string)
 };
 
 /* See description in location.h.  */