Author: markj
Date: Sat Sep 21 22:43:50 2013
New Revision: 255776
URL: http://svnweb.freebsd.org/changeset/base/255776

Log:
  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

Modified:
  head/sys/sys/sdt.h

Modified: head/sys/sys/sdt.h
==============================================================================
--- head/sys/sys/sdt.h  Sat Sep 21 22:36:07 2013        (r255775)
+++ head/sys/sys/sdt.h  Sat Sep 21 22:43:50 2013        (r255776)
@@ -160,11 +160,11 @@ SET_DECLARE(sdt_argtypes_set, struct sdt
 } 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)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to