X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Fbytecode.h;h=25ade988f8086fc8df53cda83addebb138dee5ea;hb=33b563d60bb08300f2879a7c67f5f6483ccf3943;hp=90ea9ad4ea60dba2f0bf5b1dcd3e9c2b09db8fce;hpb=04aa13f8c2944839f6514e3841b93057b443a783;p=lttng-ust.git diff --git a/liblttng-ust/bytecode.h b/liblttng-ust/bytecode.h index 90ea9ad4..25ade988 100644 --- a/liblttng-ust/bytecode.h +++ b/liblttng-ust/bytecode.h @@ -1,39 +1,15 @@ -#ifndef _BYTECODE_H -#define _BYTECODE_H - /* - * bytecode.h - * - * LTTng bytecode - * - * Copyright 2012-2016 - Mathieu Desnoyers - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. + * SPDX-License-Identifier: MIT * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. + * Copyright 2012-2016 Mathieu Desnoyers */ +#ifndef _BYTECODE_H +#define _BYTECODE_H + #include #include -#ifndef LTTNG_PACKED -#error "LTTNG_PACKED should be defined" -#endif - /* * offsets are absolute from start of bytecode. */ @@ -46,15 +22,15 @@ struct field_ref { struct get_symbol { /* Symbol offset. */ uint16_t offset; -} LTTNG_PACKED; +} __attribute__((packed)); struct get_index_u16 { uint16_t index; -} LTTNG_PACKED; +} __attribute__((packed)); struct get_index_u64 { uint64_t index; -} LTTNG_PACKED; +} __attribute__((packed)); struct literal_numeric { int64_t v;