diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-09-05 17:18:00 +0100 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2017-09-06 08:10:56 +0000 |
commit | d0a91b27f26762e9c998cc5e6fe71767de5d32c7 (patch) | |
tree | 9850efb16c84537dba93ee3d6ac8b186036ae00b /ws_attributes.h | |
parent | 143bc04ca7c11b4f5a0feef4c01627c9aee6bcd4 (diff) |
plugins: config.h must not be included by public headers
For a sane plugin build environment. Include config.h as the first
header in the .c file instead.
Fix by moving required compiler attribute macros to a new
"ws_attributes.h" API header.
Change-Id: I34f58a927f68c1a0e59686c14d214825149749e1
Reviewed-on: https://code.wireshark.org/review/23400
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'ws_attributes.h')
-rw-r--r-- | ws_attributes.h | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/ws_attributes.h b/ws_attributes.h new file mode 100644 index 0000000000..d07ae75324 --- /dev/null +++ b/ws_attributes.h @@ -0,0 +1,59 @@ +/* ws_attributes.h + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef __WS_ATTRIBUTES_H__ +#define __WS_ATTRIBUTES_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* + * If we're running GCC or clang define _U_ to be "__attribute__((unused))" + * so we can use _U_ to flag unused function parameters and not get warnings + * about them. Otherwise, define _U_ to be an empty string so that _U_ used + * to flag an unused function parameters will compile with other compilers. + * + * XXX - similar hints for other compilers? + */ + +#if defined(__GNUC__) + /* This includes clang */ + #define _U_ __attribute__((unused)) +#else + #define _U_ +#endif + +/* Hint to the compiler that a function never returns */ +#if defined(__GNUC__) + /* This includes clang */ + #define WS_NORETURN __attribute__((noreturn)) +#elif defined(_MSC_VER) + #define WS_NORETURN __declspec(noreturn) +#else + #define WS_NORETURN +#endif + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __WS_ATTRIBUTES_H__ */ |