[src/trunk]: src/external/bsd/jemalloc/dist/include/jemalloc/internal fix sha...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bc12e98d2c5d
branches:  trunk
changeset: 997356:bc12e98d2c5d
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Mar 04 20:03:00 2019 +0000

description:
fix shadowing

diffstat:

 external/bsd/jemalloc/dist/include/jemalloc/internal/prof_inlines_b.h |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r bb0a97f9543f -r bc12e98d2c5d external/bsd/jemalloc/dist/include/jemalloc/internal/prof_inlines_b.h
--- a/external/bsd/jemalloc/dist/include/jemalloc/internal/prof_inlines_b.h     Mon Mar 04 20:02:18 2019 +0000
+++ b/external/bsd/jemalloc/dist/include/jemalloc/internal/prof_inlines_b.h     Mon Mar 04 20:03:00 2019 +0000
@@ -99,14 +99,14 @@
 }
 
 JEMALLOC_ALWAYS_INLINE prof_tctx_t *
-prof_alloc_prep(tsd_t *tsd, size_t usize, bool prof_active, bool update) {
+prof_alloc_prep(tsd_t *tsd, size_t usize, bool _prof_active, bool update) {
        prof_tctx_t *ret;
        prof_tdata_t *tdata;
        prof_bt_t bt;
 
        assert(usize == sz_s2u(usize));
 
-       if (!prof_active || likely(prof_sample_accum_update(tsd, usize, update,
+       if (!_prof_active || likely(prof_sample_accum_update(tsd, usize, update,
            &tdata))) {
                ret = (prof_tctx_t *)(uintptr_t)1U;
        } else {
@@ -135,14 +135,14 @@
 
 JEMALLOC_ALWAYS_INLINE void
 prof_realloc(tsd_t *tsd, const void *ptr, size_t usize, prof_tctx_t *tctx,
-    bool prof_active, bool updated, const void *old_ptr, size_t old_usize,
+    bool _prof_active, bool updated, const void *old_ptr, size_t old_usize,
     prof_tctx_t *old_tctx) {
        bool sampled, old_sampled, moved;
 
        cassert(config_prof);
        assert(ptr != NULL || (uintptr_t)tctx <= (uintptr_t)1U);
 
-       if (prof_active && !updated && ptr != NULL) {
+       if (_prof_active && !updated && ptr != NULL) {
                assert(usize == isalloc(tsd_tsdn(tsd), ptr));
                if (prof_sample_accum_update(tsd, usize, true, NULL)) {
                        /*