Bug 1466375: avoid NRREGGET NRREGSET redefinition. r=bwc
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Mon, 04 Jun 2018 08:51:22 -0700
changeset 479804 56be2e8bb66a80a4d76cd8eb4fbf80cfe128483b
parent 479803 8109f534579cc5f1bd2cf3d2537240ae96cb476a
child 479805 97d477bf9b2c0f80310239fb6f7ddc16430ed949
push id1757
push userffxbld-merge
push dateFri, 24 Aug 2018 17:02:43 +0000
treeherdermozilla-release@736023aebdb1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbwc
bugs1466375
milestone62.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1466375: avoid NRREGGET NRREGSET redefinition. r=bwc MozReview-Commit-ID: 6DdZS7bY2di
media/mtransport/third_party/nrappkit/src/registry/registry_local.c
--- a/media/mtransport/third_party/nrappkit/src/registry/registry_local.c
+++ b/media/mtransport/third_party/nrappkit/src/registry/registry_local.c
@@ -877,32 +877,32 @@ nr_reg_local_init(nr_registry_module *me
           ABORT(r);
     }
 
     _status=0;
   abort:
     return(_status);
 }
 
-#define NRREGGET(func, TYPE, type)                                  \
+#define NRREGLOCALGET(func, TYPE, type)                             \
 int                                                                 \
 func(NR_registry name, type *out)                                   \
 {                                                                   \
     return nr_reg_get(name, TYPE, out);                             \
 }
 
-NRREGGET(nr_reg_local_get_char,     NR_REG_TYPE_CHAR,     char)
-NRREGGET(nr_reg_local_get_uchar,    NR_REG_TYPE_UCHAR,    UCHAR)
-NRREGGET(nr_reg_local_get_int2,     NR_REG_TYPE_INT2,     INT2)
-NRREGGET(nr_reg_local_get_uint2,    NR_REG_TYPE_UINT2,    UINT2)
-NRREGGET(nr_reg_local_get_int4,     NR_REG_TYPE_INT4,     INT4)
-NRREGGET(nr_reg_local_get_uint4,    NR_REG_TYPE_UINT4,    UINT4)
-NRREGGET(nr_reg_local_get_int8,     NR_REG_TYPE_INT8,     INT8)
-NRREGGET(nr_reg_local_get_uint8,    NR_REG_TYPE_UINT8,    UINT8)
-NRREGGET(nr_reg_local_get_double,   NR_REG_TYPE_DOUBLE,   double)
+NRREGLOCALGET(nr_reg_local_get_char,     NR_REG_TYPE_CHAR,     char)
+NRREGLOCALGET(nr_reg_local_get_uchar,    NR_REG_TYPE_UCHAR,    UCHAR)
+NRREGLOCALGET(nr_reg_local_get_int2,     NR_REG_TYPE_INT2,     INT2)
+NRREGLOCALGET(nr_reg_local_get_uint2,    NR_REG_TYPE_UINT2,    UINT2)
+NRREGLOCALGET(nr_reg_local_get_int4,     NR_REG_TYPE_INT4,     INT4)
+NRREGLOCALGET(nr_reg_local_get_uint4,    NR_REG_TYPE_UINT4,    UINT4)
+NRREGLOCALGET(nr_reg_local_get_int8,     NR_REG_TYPE_INT8,     INT8)
+NRREGLOCALGET(nr_reg_local_get_uint8,    NR_REG_TYPE_UINT8,    UINT8)
+NRREGLOCALGET(nr_reg_local_get_double,   NR_REG_TYPE_DOUBLE,   double)
 
 int
 nr_reg_local_get_registry(NR_registry name, NR_registry out)
 {
     int r, _status;
     nr_scalar_registry_node *node = 0;
     int free_node = 0;
 
@@ -970,32 +970,32 @@ nr_reg_local_get_type(NR_registry name, 
     strncpy(type, str, sizeof(NR_registry_type));
 
     _status=0;
   abort:
     return(_status);
 }
 
 
-#define NRREGSET(func, TYPE, type)                              \
+#define NRREGLOCALSET(func, TYPE, type)                         \
 int                                                             \
 func(NR_registry name, type data)                               \
 {                                                               \
     return nr_reg_set(name, TYPE, &data);                       \
 }
 
-NRREGSET(nr_reg_local_set_char,     NR_REG_TYPE_CHAR,     char)
-NRREGSET(nr_reg_local_set_uchar,    NR_REG_TYPE_UCHAR,    UCHAR)
-NRREGSET(nr_reg_local_set_int2,     NR_REG_TYPE_INT2,     INT2)
-NRREGSET(nr_reg_local_set_uint2,    NR_REG_TYPE_UINT2,    UINT2)
-NRREGSET(nr_reg_local_set_int4,     NR_REG_TYPE_INT4,     INT4)
-NRREGSET(nr_reg_local_set_uint4,    NR_REG_TYPE_UINT4,    UINT4)
-NRREGSET(nr_reg_local_set_int8,     NR_REG_TYPE_INT8,     INT8)
-NRREGSET(nr_reg_local_set_uint8,    NR_REG_TYPE_UINT8,    UINT8)
-NRREGSET(nr_reg_local_set_double,   NR_REG_TYPE_DOUBLE,   double)
+NRREGLOCALSET(nr_reg_local_set_char,     NR_REG_TYPE_CHAR,     char)
+NRREGLOCALSET(nr_reg_local_set_uchar,    NR_REG_TYPE_UCHAR,    UCHAR)
+NRREGLOCALSET(nr_reg_local_set_int2,     NR_REG_TYPE_INT2,     INT2)
+NRREGLOCALSET(nr_reg_local_set_uint2,    NR_REG_TYPE_UINT2,    UINT2)
+NRREGLOCALSET(nr_reg_local_set_int4,     NR_REG_TYPE_INT4,     INT4)
+NRREGLOCALSET(nr_reg_local_set_uint4,    NR_REG_TYPE_UINT4,    UINT4)
+NRREGLOCALSET(nr_reg_local_set_int8,     NR_REG_TYPE_INT8,     INT8)
+NRREGLOCALSET(nr_reg_local_set_uint8,    NR_REG_TYPE_UINT8,    UINT8)
+NRREGLOCALSET(nr_reg_local_set_double,   NR_REG_TYPE_DOUBLE,   double)
 
 int
 nr_reg_local_set_registry(NR_registry name)
 {
     return nr_reg_set(name, NR_REG_TYPE_REGISTRY, 0);
 }
 
 int