diff options
author | Tim-Philipp Müller <tim@centricular.com> | 2016-01-14 21:46:31 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.com> | 2016-01-14 21:46:31 +0000 |
commit | 7c6ba5e4758f58eeb0c889f81745b9dcd2d98f34 (patch) | |
tree | 66b339e926dd1698be97f0c4007433a2635dbb87 | |
parent | 0725456ecd27462751a4cb00a719513ce8736d75 (diff) |
gss-stream: fix duplicate symbols build error
duplicate symbol _gss_stream_fd_table in:
.libs/libgss_1.0_la-gss-hls-server.o
.libs/libgss_1.0_la-gss-server.o
duplicate symbol _gss_stream_fd_table in:
.libs/libgss_1.0_la-gss-hls-server.o
.libs/libgss_1.0_la-gss-session.o
...
Caused by a missing 'extern' in the header for
the declaration of the fd table. Since the table
isn't used elsewhere, we may just as well make
it private though.
-rw-r--r-- | gst-streaming-server/gss-stream.c | 9 | ||||
-rw-r--r-- | gst-streaming-server/gss-stream.h | 12 |
2 files changed, 9 insertions, 12 deletions
diff --git a/gst-streaming-server/gss-stream.c b/gst-streaming-server/gss-stream.c index 0e3300e..feee719 100644 --- a/gst-streaming-server/gss-stream.c +++ b/gst-streaming-server/gss-stream.c @@ -43,6 +43,15 @@ enum #define DEFAULT_HEIGHT 360 #define DEFAULT_BITRATE 600000 +#define GSS_STREAM_MAX_FDS 65536 +typedef struct _FDInfo FDInfo; +struct _FDInfo +{ + void (*callback) (GssStream * stream, int fd, void *priv); + void *priv; +}; +static FDInfo gss_stream_fd_table[GSS_STREAM_MAX_FDS]; + static void msg_wrote_headers (SoupMessage * msg, void *user_data); diff --git a/gst-streaming-server/gss-stream.h b/gst-streaming-server/gss-stream.h index a0cc91e..a2f6368 100644 --- a/gst-streaming-server/gss-stream.h +++ b/gst-streaming-server/gss-stream.h @@ -117,18 +117,6 @@ struct _GssConnection { GssProgram *program; }; - -/* internal */ -#define GSS_STREAM_MAX_FDS 65536 -typedef struct _FDInfo FDInfo; -struct _FDInfo { - void (*callback) (GssStream *stream, int fd, void *priv); - void *priv; -}; -FDInfo gss_stream_fd_table[GSS_STREAM_MAX_FDS]; -/* end internal */ - - GType gss_stream_get_type (void); GType gss_stream_type_get_type (void); |