X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-tracepoint-event-reset.h;h=5ac372daa029421e5a387a68e90f15a092f30f32;hb=1c324e592f238f5c1d19b19faf3a95a6d9185bdf;hp=0d5611d2ca3391353c896183afd6b83fa8d3120d;hpb=11dfd4ee2d1833b4f67c3016631f8fa411646012;p=lttng-ust.git

diff --git a/include/lttng/ust-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h
index 0d5611d2..5ac372da 100644
--- a/include/lttng/ust-tracepoint-event-reset.h
+++ b/include/lttng/ust-tracepoint-event-reset.h
@@ -1,12 +1,32 @@
 /*
- * lttng/ust-tracepoint-events-reset.h
+ * Copyright (c) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+ * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Permission is hereby granted to use or copy this program
+ * for any purpose,  provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
  */
 
-/* Reset macros used within TRACEPOINT_EVENT to "nothing" */
+/* Define to "nothing" all macros used for TRACEPOINT_EVENT */
+
+#undef TRACEPOINT_EVENT
+#define TRACEPOINT_EVENT(_provider, _name, _args, _fields)
+
+#undef TRACEPOINT_EVENT_CLASS
+#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)
+
+#undef TRACEPOINT_EVENT_INSTANCE
+#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)
+
+#undef TP_ARGS
+#define TP_ARGS(...)
+
+#undef TP_FIELDS
+#define TP_FIELDS(...)
 
 #undef ctf_integer_ext
 #define ctf_integer_ext(_type, _item, _src, _byte_order, _base)
@@ -23,24 +43,3 @@
 
 #undef ctf_string
 #define ctf_string(_item, _src)
-
-#undef TP_PROTO
-#define TP_PROTO(args...)
-
-#undef TP_VARS
-#define TP_VARS(args...)
-
-#undef TP_FIELDS
-#define TP_FIELDS(args...)
-
-#undef TRACEPOINT_EVENT_CLASS
-#define TRACEPOINT_EVENT_CLASS(_provider, _name, _proto, _args, _fields)
-
-#undef TRACEPOINT_EVENT_CLASS_NOARGS
-#define TRACEPOINT_EVENT_CLASS_NOARGS(_provider, _name, _fields)
-
-#undef TRACEPOINT_EVENT_INSTANCE
-#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _proto, _args)
-
-#undef TRACEPOINT_EVENT_INSTANCE_NOARGS
-#define TRACEPOINT_EVENT_INSTANCE_NOARGS(_provider, _template, _name)