aboutsummaryrefslogtreecommitdiff
path: root/sys/sys/sdt.h
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2013-09-21 22:43:50 +0000
committerMark Johnston <markj@FreeBSD.org>2013-09-21 22:43:50 +0000
commit5605b69c9898fb44018a6af713c438781a75b967 (patch)
tree0ba4fecff3361dd4f79d9d00e60c8c320f0c51d5 /sys/sys/sdt.h
parentbfe5c479c0fdf88d0f9890b164eae06300916385 (diff)
downloadsrc-5605b69c9898fb44018a6af713c438781a75b967.tar.gz
src-5605b69c9898fb44018a6af713c438781a75b967.zip
Give argtype struct names a different prefix than probe struct names.
Otherwise it's possible to declare SDT probes in such a way that a name collision occurs, causing an unexpected compilation error. Approved by: re (gjb) MFC after: 1 week
Notes
Notes: svn path=/head/; revision=255776
Diffstat (limited to 'sys/sys/sdt.h')
-rw-r--r--sys/sys/sdt.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/sys/sdt.h b/sys/sys/sdt.h
index 820f4bba0cad..f7b58f64b649 100644
--- a/sys/sys/sdt.h
+++ b/sys/sys/sdt.h
@@ -160,11 +160,11 @@ SET_DECLARE(sdt_argtypes_set, struct sdt_argtype);
} while (0)
#define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type, xtype) \
- static struct sdt_argtype sdt_##prov##_##mod##_##func##_##name##num[1] \
+ static struct sdt_argtype sdta_##prov##_##mod##_##func##_##name##num[1] \
= { { num, type, xtype, { NULL, NULL }, \
sdt_##prov##_##mod##_##func##_##name } \
}; \
- DATA_SET(sdt_argtypes_set, sdt_##prov##_##mod##_##func##_##name##num);
+ DATA_SET(sdt_argtypes_set, sdta_##prov##_##mod##_##func##_##name##num);
#define SDT_PROBE_DEFINE0(prov, mod, func, name, sname) \
SDT_PROBE_DEFINE(prov, mod, func, name, sname)