aboutsummaryrefslogtreecommitdiffstats
path: root/codecs
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2017-09-05 17:18:00 +0100
committerJoão Valverde <j@v6e.pt>2017-09-06 08:10:56 +0000
commitd0a91b27f26762e9c998cc5e6fe71767de5d32c7 (patch)
tree9850efb16c84537dba93ee3d6ac8b186036ae00b /codecs
parent143bc04ca7c11b4f5a0feef4c01627c9aee6bcd4 (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 'codecs')
-rw-r--r--codecs/G711a/G711adecode.c2
-rw-r--r--codecs/G711u/G711udecode.c2
-rw-r--r--codecs/G722/G722decode.c2
-rw-r--r--codecs/G726/G726decode.c2
-rw-r--r--codecs/G729/G729decode.c2
-rw-r--r--codecs/codecs.h3
-rw-r--r--codecs/speex/resample.c2
7 files changed, 13 insertions, 2 deletions
diff --git a/codecs/G711a/G711adecode.c b/codecs/G711a/G711adecode.c
index 2ed2436058..3ca1fb4f8b 100644
--- a/codecs/G711a/G711adecode.c
+++ b/codecs/G711a/G711adecode.c
@@ -27,6 +27,8 @@
#include "G711adecode.h"
#include "G711atable.h"
+#include "ws_attributes.h"
+
void *
codec_g711a_init(void)
{
diff --git a/codecs/G711u/G711udecode.c b/codecs/G711u/G711udecode.c
index 8db44bed12..7c17f72ac5 100644
--- a/codecs/G711u/G711udecode.c
+++ b/codecs/G711u/G711udecode.c
@@ -27,6 +27,8 @@
#include "G711udecode.h"
#include "G711utable.h"
+#include "ws_attributes.h"
+
void *
codec_g711u_init(void)
{
diff --git a/codecs/G722/G722decode.c b/codecs/G722/G722decode.c
index e4951f8cd6..73d36f0847 100644
--- a/codecs/G722/G722decode.c
+++ b/codecs/G722/G722decode.c
@@ -28,6 +28,8 @@
#include "spandsp.h"
#include "G722decode.h"
+#include "ws_attributes.h"
+
void *
codec_g722_init(void)
{
diff --git a/codecs/G726/G726decode.c b/codecs/G726/G726decode.c
index fb98182614..b5580afd8b 100644
--- a/codecs/G726/G726decode.c
+++ b/codecs/G726/G726decode.c
@@ -27,6 +27,8 @@
#include "spandsp.h"
#include "G726decode.h"
+#include "ws_attributes.h"
+
typedef struct _g726_codec_ctx {
g726_state_t *state;
int bit_rate;
diff --git a/codecs/G729/G729decode.c b/codecs/G729/G729decode.c
index e5bb2ea61c..1594a5f9b4 100644
--- a/codecs/G729/G729decode.c
+++ b/codecs/G729/G729decode.c
@@ -27,6 +27,8 @@
#include "bcg729/decoder.h"
#include "G729decode.h"
+#include "ws_attributes.h"
+
void *
codec_g729_init(void)
{
diff --git a/codecs/codecs.h b/codecs/codecs.h
index 10aceae0d7..fabc734206 100644
--- a/codecs/codecs.h
+++ b/codecs/codecs.h
@@ -23,10 +23,9 @@
#ifndef _CODECS_H_
#define _CODECS_H_
-#include <config.h>
-
#include <epan/epan.h>
#include "ws_symbol_export.h"
+#include "ws_attributes.h"
#ifdef __cplusplus
extern "C" {
diff --git a/codecs/speex/resample.c b/codecs/speex/resample.c
index 4a0e53deb1..4457c639b8 100644
--- a/codecs/speex/resample.c
+++ b/codecs/speex/resample.c
@@ -80,6 +80,8 @@ static void speex_free (void *ptr) {g_free(ptr);}
#include <math.h>
#include <limits.h>
+#include "ws_attributes.h"
+
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif