Attachment #237051 for bug #326327




#define	TRUE	(!FALSE)
#endif

#ifndef	MAX
#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
#endif

#ifndef	MIN
#define MIN(a, b)  (((a) < (b)) ? (a) : (b))
#endif

#undef	ABS
#define ABS(a)	   (((a) < 0) ? -(a) : (a))

Lines 55-60 Link Here

(-)gio/gsocket.c.dist (-7 / +13 lines)
55		55
56	#include "gioalias.h"	56	#include "gioalias.h"
57		57
		58	#ifdef __sgi
		59	#define msghdr nmsghdr
		60	#undef msg_control
		61	#undef msg_controllen
		62	#endif
		63
58	/**	64	/**
59	* SECTION:gsocket	65	* SECTION:gsocket
60	* @short_description: Low-level socket object	66	* @short_description: Low-level socket object
Lines 300-307 g_socket_details_from_fd (GSocket *socke Link Here
300	{	306	{
301	struct sockaddr_storage address;	307	struct sockaddr_storage address;
302	gint fd;	308	gint fd;
303	guint addrlen;	309	socklen_t addrlen;
304	guint optlen;	310	socklen_t optlen;
305	int value;	311	int value;
306	int errsv;	312	int errsv;
307	#ifdef G_OS_WIN32	313	#ifdef G_OS_WIN32
Lines 1101-1107 g_socket_get_local_address (GSocket *so Link Here
1101	GError **error)	1107	GError **error)
1102	{	1108	{
1103	struct sockaddr_storage buffer;	1109	struct sockaddr_storage buffer;
1104	guint32 len = sizeof (buffer);	1110	socklen_t len = sizeof (buffer);
1105		1111
1106	g_return_val_if_fail (G_IS_SOCKET (socket), NULL);	1112	g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
1107		1113
Lines 1134-1140 g_socket_get_remote_address (GSocket *s Link Here
1134	GError **error)	1140	GError **error)
1135	{	1141	{
1136	struct sockaddr_storage buffer;	1142	struct sockaddr_storage buffer;
1137	guint32 len = sizeof (buffer);	1143	socklen_t len = sizeof (buffer);
1138		1144
1139	g_return_val_if_fail (G_IS_SOCKET (socket), NULL);	1145	g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
1140		1146
Lines 1310-1321 g_socket_speaks_ipv4 (GSocket *socket) Link Here
1310	case G_SOCKET_FAMILY_IPV6:	1316	case G_SOCKET_FAMILY_IPV6:
1311	#if defined (IPPROTO_IPV6) && defined (IPV6_V6ONLY)	1317	#if defined (IPPROTO_IPV6) && defined (IPV6_V6ONLY)
1312	{	1318	{
1313	guint sizeof_int = sizeof (int);	1319	socklen_t sizeof_socklen_t = sizeof (socklen_t);
1314	gint v6_only;	1320	gint v6_only;
1315		1321
1316	if (getsockopt (socket->priv->fd,	1322	if (getsockopt (socket->priv->fd,
1317	IPPROTO_IPV6, IPV6_V6ONLY,	1323	IPPROTO_IPV6, IPV6_V6ONLY,
1318	&v6_only, &sizeof_int) != 0)	1324	&v6_only, &sizeof_socklen_t) != 0)
1319	return FALSE;	1325	return FALSE;
1320		1326
1321	return !v6_only;	1327	return !v6_only;
Lines 1547-1553 gboolean Link Here
1547	g_socket_check_connect_result (GSocket *socket,	1553	g_socket_check_connect_result (GSocket *socket,
1548	GError **error)	1554	GError **error)
1549	{	1555	{
1550	guint optlen;	1556	socklen_t optlen;
1551	int value;	1557	int value;
1552		1558
1553	optlen = sizeof (value);	1559	optlen = sizeof (value);

Lines 42-47 Link Here

(-)gio/gunixfdmessage.c.dist (+9 lines)
42		42
43	#include "gioalias.h"	43	#include "gioalias.h"
44		44
		45	#ifdef __sgi
		46	/* SCM_RIGHTS is only defined in <sys/socket.h> if _KERNEL
		47	* or _XOPEN_SOURCE are also defined...
		48	*/
		49	#ifndef SCM_RIGHTS
		50	#define SCM_RIGHTS 0x01
		51	#endif
		52	#endif
		53
45		54
46	G_DEFINE_TYPE (GUnixFDMessage, g_unix_fd_message,	55	G_DEFINE_TYPE (GUnixFDMessage, g_unix_fd_message,
47	G_TYPE_SOCKET_CONTROL_MESSAGE);	56	G_TYPE_SOCKET_CONTROL_MESSAGE);

Lines 205-211 main (int argc, Link Here

(-)gio/tests/socket-server.c.dist (-1 / +1 lines)
205		205
206	while (TRUE)	206	while (TRUE)
207	{	207	{
208	gchar buffer[4096] = { };	208	gchar buffer[4096];
209	gssize size;	209	gssize size;
210	gsize to_send;	210	gsize to_send;
211		211

Lines 203-209 main (int argc, Link Here

(-)gio/tests/socket-client.c.dist (-1 / +1 lines)
203		203
204	while (TRUE)	204	while (TRUE)
205	{	205	{
206	gchar buffer[4096] = { };	206	gchar buffer[4096];
207	gssize size;	207	gssize size;
208	gsize to_send;	208	gsize to_send;
209		209

Return to bug 326327

Lines 187-197 Link Here

(-)glib/gmacros.h.dist (-2 / +4 lines)
187	#define TRUE (!FALSE)	187	#define TRUE (!FALSE)
188	#endif	188	#endif
189		189
190	#undef MAX	190	#ifndef MAX
191	#define MAX(a, b) (((a) > (b)) ? (a) : (b))	191	#define MAX(a, b) (((a) > (b)) ? (a) : (b))
		192	#endif
192		193
193	#undef MIN	194	#ifndef MIN
194	#define MIN(a, b) (((a) < (b)) ? (a) : (b))	195	#define MIN(a, b) (((a) < (b)) ? (a) : (b))
		196	#endif
195		197
196	#undef ABS	198	#undef ABS
197	#define ABS(a) (((a) < 0) ? -(a) : (a))	199	#define ABS(a) (((a) < 0) ? -(a) : (a))