X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=probes%2Flttng-events-reset.h;h=b601e8d8d971ba2165909c429e9eae63f92e00b8;hb=84da520620463b0168a5ecc750adc5332d857c9c;hp=c8a1046d90b95bcd315903300e35301ca4c98995;hpb=f7bdf4db0b992946342dc845c7369e9cdca46559;p=lttng-modules.git diff --git a/probes/lttng-events-reset.h b/probes/lttng-events-reset.h index c8a1046d..b601e8d8 100644 --- a/probes/lttng-events-reset.h +++ b/probes/lttng-events-reset.h @@ -1,9 +1,21 @@ /* * lttng-events-reset.h * - * Copyright (C) 2010-2011 Mathieu Desnoyers + * Copyright (C) 2010-2012 Mathieu Desnoyers * - * Dual LGPL v2.1/GPL v2 license. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; only + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /* Reset macros used within TRACE_EVENT to "nothing" */ @@ -17,6 +29,9 @@ #undef __dynamic_array_enc_ext #define __dynamic_array_enc_ext(_type, _item, _length, _order, _base, _encoding) +#undef __dynamic_array_enc_ext_2 +#define __dynamic_array_enc_ext_2(_type, _item, _length1, _length2, _order, _base, _encoding) + #undef __dynamic_array_len #define __dynamic_array_len(_type, _item, _length) @@ -74,11 +89,11 @@ #undef DECLARE_EVENT_CLASS_NOARGS #define DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) -#undef DEFINE_EVENT -#define DEFINE_EVENT(_template, _name, _proto, _args) +#undef DEFINE_EVENT_MAP +#define DEFINE_EVENT_MAP(_template, _name, _map, _proto, _args) -#undef DEFINE_EVENT_NOARGS -#define DEFINE_EVENT_NOARGS(_template, _name) +#undef DEFINE_EVENT_MAP_NOARGS +#define DEFINE_EVENT_MAP_NOARGS(_template, _name, _map) #undef TRACE_EVENT_FLAGS #define TRACE_EVENT_FLAGS(name, value)