Module Name: src
Committed By: christos
Date: Mon Mar 4 20:06:31 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/include/jemalloc/internal: ph.h
Log Message:
- fix shadowing
- add constcond
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h Mon Mar 4 15:06:31 2019
@@ -34,19 +34,19 @@ struct { \
(a_phn->a_field.phn_lchild)
#define phn_lchild_set(a_type, a_field, a_phn, a_lchild) do { \
a_phn->a_field.phn_lchild = a_lchild; \
-} while (0)
+} while (/*CONSTCOND*/0)
#define phn_next_get(a_type, a_field, a_phn) \
(a_phn->a_field.phn_next)
#define phn_prev_set(a_type, a_field, a_phn, a_prev) do { \
a_phn->a_field.phn_prev = a_prev; \
-} while (0)
+} while (/*CONSTCOND*/0)
#define phn_prev_get(a_type, a_field, a_phn) \
(a_phn->a_field.phn_prev)
#define phn_next_set(a_type, a_field, a_phn, a_next) do { \
a_phn->a_field.phn_next = a_next; \
-} while (0)
+} while (/*CONSTCOND*/0)
#define phn_merge_ordered(a_type, a_field, a_phn0, a_phn1, a_cmp) do { \
a_type *phn0child; \
@@ -62,7 +62,7 @@ struct { \
phn_prev_set(a_type, a_field, phn0child, a_phn1); \
} \
phn_lchild_set(a_type, a_field, a_phn0, a_phn1); \
-} while (0)
+} while (/*CONSTCOND*/0)
#define phn_merge(a_type, a_field, a_phn0, a_phn1, a_cmp, r_phn) do { \
if (a_phn0 == NULL) { \
@@ -78,7 +78,7 @@ struct { \
a_cmp); \
r_phn = a_phn1; \
} \
-} while (0)
+} while (/*CONSTCOND*/0)
#define ph_merge_siblings(a_type, a_field, a_phn, a_cmp, r_phn) do { \
a_type *head = NULL; \
@@ -165,20 +165,20 @@ struct { \
} \
} \
r_phn = phn0; \
-} while (0)
+} while (/*CONSTCOND*/0)
#define ph_merge_aux(a_type, a_field, a_ph, a_cmp) do { \
- a_type *phn = phn_next_get(a_type, a_field, a_ph->ph_root); \
- if (phn != NULL) { \
+ a_type *_phn = phn_next_get(a_type, a_field, a_ph->ph_root); \
+ if (_phn != NULL) { \
phn_prev_set(a_type, a_field, a_ph->ph_root, NULL); \
phn_next_set(a_type, a_field, a_ph->ph_root, NULL); \
- phn_prev_set(a_type, a_field, phn, NULL); \
- ph_merge_siblings(a_type, a_field, phn, a_cmp, phn); \
- assert(phn_next_get(a_type, a_field, phn) == NULL); \
- phn_merge(a_type, a_field, a_ph->ph_root, phn, a_cmp, \
+ phn_prev_set(a_type, a_field, _phn, NULL); \
+ ph_merge_siblings(a_type, a_field, _phn, a_cmp, _phn); \
+ assert(phn_next_get(a_type, a_field, _phn) == NULL); \
+ phn_merge(a_type, a_field, a_ph->ph_root, _phn, a_cmp, \
a_ph->ph_root); \
} \
-} while (0)
+} while (/*CONSTCOND*/0)
#define ph_merge_children(a_type, a_field, a_phn, a_cmp, r_phn) do { \
a_type *lchild = phn_lchild_get(a_type, a_field, a_phn); \
@@ -188,7 +188,7 @@ struct { \
ph_merge_siblings(a_type, a_field, lchild, a_cmp, \
r_phn); \
} \
-} while (0)
+} while (/*CONSTCOND*/0)
/*
* The ph_proto() macro generates function prototypes that correspond to the
