diff options
author | Colin Guthrie <colin@mageia.org> | 2011-11-27 14:19:57 +0000 |
---|---|---|
committer | Colin Guthrie <colin@mageia.org> | 2011-11-27 14:54:01 +0000 |
commit | c95650b929e488b9122a2d63a5aba9d957521ddc (patch) | |
tree | e9a16e20e02b34b83875e8dbefba10007a56a7fd | |
parent | 7e5a741dd17a69792c8d850bdb79612c6e82b2c8 (diff) |
pulsecore: Fix issue with circuilar definitions.
Without this fix, errors about previous definitions are generated in
numerous locations.
Example of error:
CC libpulsecore_1.98_la-auth-cookie.lo
In file included from ../../src/pulsecore/source.h:46:0,
from ../../src/pulsecore/sink.h:40,
from ../../src/pulsecore/core.h:50,
from ../../src/pulsecore/shared.h:25,
from ../../src/pulsecore/auth-cookie.c:33:
../../src/pulsecore/device-port.h:40:24: error: redefinition of typedef
'pa_core'
../../src/pulsecore/core.h:29:24: note: previous declaration of
'pa_core' was here
make[3]: *** [libpulsecore_1.98_la-auth-cookie.lo] Error 1
Overall it would be nicer if we could avoid this kind of fix, but it
would require further reorganisation that I'm not prepared to undertake
right now.
-rw-r--r-- | src/pulsecore/device-port.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pulsecore/device-port.h b/src/pulsecore/device-port.h index f38702152..7e7ed8de0 100644 --- a/src/pulsecore/device-port.h +++ b/src/pulsecore/device-port.h @@ -37,13 +37,13 @@ /* Note: Including core.h here leads to circular references (device-port.h -> core.h -> sink.h -> device-port.h), hence the line below instead */ -typedef struct pa_core pa_core; +struct pa_core; typedef struct pa_device_port pa_device_port; struct pa_device_port { pa_object parent; /* Needed for reference counting */ - pa_core *core; + struct pa_core *core; char *name; char *description; @@ -63,7 +63,7 @@ PA_DECLARE_PUBLIC_CLASS(pa_device_port); #define PA_DEVICE_PORT_DATA(d) ((void*) ((uint8_t*) d + PA_ALIGN(sizeof(pa_device_port)))) -pa_device_port *pa_device_port_new(pa_core *c, const char *name, const char *description, size_t extra); +pa_device_port *pa_device_port_new(struct pa_core *c, const char *name, const char *description, size_t extra); void pa_device_port_hashmap_free(pa_hashmap *h); |