mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 06:36:13 +00:00
gst/avi/gstavidemux.c: Declare variables at beginning of block and make gcc-2.95 happy
Original commit message from CVS: * gst/avi/gstavidemux.c: (gst_avi_demux_invert): Declare variables at beginning of block and make gcc-2.95 happy (fixes # 167482, patch by Gergely Nagy). * gst/tcp/gsttcpclientsrc.c: * gst/tcp/gsttcpclientsrc.h: Move some includes into the header, so that struct sockaddr_in is defined when it should be defined on FreeBSD as well (fixes #167483). * gst/tcp/gsttcpserversrc.c: (gst_tcpserversrc_init_receive): Don't pass uninitialised values to setsockopt() here either.
This commit is contained in:
parent
eb33462a15
commit
7f683b852e
4 changed files with 18 additions and 3 deletions
15
ChangeLog
15
ChangeLog
|
@ -1,3 +1,18 @@
|
||||||
|
2005-02-17 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
|
* gst/avi/gstavidemux.c: (gst_avi_demux_invert):
|
||||||
|
Declare variables at beginning of block and make gcc-2.95 happy
|
||||||
|
(fixes # 167482, patch by Gergely Nagy).
|
||||||
|
|
||||||
|
* gst/tcp/gsttcpclientsrc.c:
|
||||||
|
* gst/tcp/gsttcpclientsrc.h:
|
||||||
|
Move some includes into the header, so that struct sockaddr_in is
|
||||||
|
defined when it should be defined on FreeBSD as well (fixes
|
||||||
|
#167483).
|
||||||
|
|
||||||
|
* gst/tcp/gsttcpserversrc.c: (gst_tcpserversrc_init_receive):
|
||||||
|
Don't pass uninitialised values to setsockopt() here either.
|
||||||
|
|
||||||
2005-02-17 Luca Ognibene <luogni at tin dot it>
|
2005-02-17 Luca Ognibene <luogni at tin dot it>
|
||||||
|
|
||||||
Reviewed by: Tim-Philipp Müller <tim at centricular dot net>
|
Reviewed by: Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
|
@ -28,9 +28,6 @@
|
||||||
#include "gsttcpclientsrc.h"
|
#include "gsttcpclientsrc.h"
|
||||||
#include <string.h> /* memset */
|
#include <string.h> /* memset */
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,8 @@ extern "C" {
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
#include <netdb.h> /* sockaddr_in */
|
#include <netdb.h> /* sockaddr_in */
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
#include <netinet/in.h> /* sockaddr_in */
|
#include <netinet/in.h> /* sockaddr_in */
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include "gsttcp.h"
|
#include "gsttcp.h"
|
||||||
|
|
|
@ -483,6 +483,7 @@ gst_tcpserversrc_init_receive (GstTCPServerSrc * this)
|
||||||
this->server_sock_fd);
|
this->server_sock_fd);
|
||||||
|
|
||||||
/* make address reusable */
|
/* make address reusable */
|
||||||
|
ret = 1;
|
||||||
if (setsockopt (this->server_sock_fd, SOL_SOCKET, SO_REUSEADDR, &ret,
|
if (setsockopt (this->server_sock_fd, SOL_SOCKET, SO_REUSEADDR, &ret,
|
||||||
sizeof (int)) < 0) {
|
sizeof (int)) < 0) {
|
||||||
GST_ELEMENT_ERROR (this, RESOURCE, SETTINGS, (NULL),
|
GST_ELEMENT_ERROR (this, RESOURCE, SETTINGS, (NULL),
|
||||||
|
|
Loading…
Reference in a new issue