svn commit: r270990 - in head: share/mk sys/sys

[Mark Johnston]

Author: markj
Date: Tue Sep  2 23:43:06 2014
New Revision: 270990
URL: http://svnweb.freebsd.org/changeset/base/270990

Log:
  Define _DTRACE_VERSION in sdt.h rather than setting it manually. This is
  similar to what illumos does, and makes it easier to enable USDT probes
  in third-party software that doesn't make use of the system makefiles.

Modified:
  head/share/mk/bsd.dep.mk
  head/sys/sys/sdt.h

Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk	Tue Sep  2 22:59:40 2014	(r270989)
+++ head/share/mk/bsd.dep.mk	Tue Sep  2 23:43:06 2014	(r270990)
@@ -125,7 +125,7 @@ ${_YC:R}.o: ${_YC}
 .if ${SRCS:M*.d}
 LDFLAGS+=	-lelf
 LDADD+=		${LIBELF}
-CFLAGS+=	-D_DTRACE_VERSION=1 -I${.OBJDIR}
+CFLAGS+=	-I${.OBJDIR}
 .endif
 .for _DSRC in ${SRCS:M*.d:N*/*}
 .for _D in ${_DSRC:R}

Modified: head/sys/sys/sdt.h
==============================================================================
--- head/sys/sys/sdt.h	Tue Sep  2 22:59:40 2014	(r270989)
+++ head/sys/sys/sdt.h	Tue Sep  2 23:43:06 2014	(r270990)
@@ -33,6 +33,8 @@
 
 #ifndef _KERNEL
 
+#define	_DTRACE_VERSION	1
+
 #define	DTRACE_PROBE(prov, name) {				\
 	extern void __dtrace_##prov##___##name(void);		\
 	__dtrace_##prov##___##name();				\