changeset 2392:9965c0bbdb7c

[gaim-migrate @ 2405] no socklen_t! committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Sat, 29 Sep 2001 02:08:00 +0000
parents abebece90bd7
children a7ecfd3f7714
files src/protocols/icq/socketmanager.c src/protocols/icq/socketmanager.h
diffstat 2 files changed, 4 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/icq/socketmanager.c	Sat Sep 29 01:36:02 2001 +0000
+++ b/src/protocols/icq/socketmanager.c	Sat Sep 29 02:08:00 2001 +0000
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 
 /*
- * $Id: socketmanager.c 2096 2001-07-31 01:00:39Z warmenhoven $
+ * $Id: socketmanager.c 2405 2001-09-29 02:08:00Z warmenhoven $
  *
  * Copyright (C) 1998-2001, Denis V. Dmitrienko <denis@null.net> and
  *                          Bill Soudan <soudan@kde.org>
@@ -74,7 +74,7 @@
  * Creates a new socket by accepting a connection from a listening
  * socket.
  */
-int icq_SocketAccept(int listens, struct sockaddr *addr, socklen_t *addrlen)
+int icq_SocketAccept(int listens, struct sockaddr *addr, int *addrlen)
 {
   int s = accept(listens, addr, addrlen);
 
--- a/src/protocols/icq/socketmanager.h	Sat Sep 29 01:36:02 2001 +0000
+++ b/src/protocols/icq/socketmanager.h	Sat Sep 29 02:08:00 2001 +0000
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 
 /*
- * $Id: socketmanager.h 2096 2001-07-31 01:00:39Z warmenhoven $
+ * $Id: socketmanager.h 2405 2001-09-29 02:08:00Z warmenhoven $
  *
  * Copyright (C) 1998-2001, Denis V. Dmitrienko <denis@null.net> and
  *                          Bill Soudan <soudan@kde.org>
@@ -32,13 +32,9 @@
 #include <sys/types.h>
 
 #ifndef _WIN32
-#ifdef NEED_SOCKLEN_T
-typedef unsigned int socklen_t;
-#endif
 #include <sys/socket.h>
 #else
 #include <winsock.h>
-typedef unsigned __int32 socklen_t;
 #endif
 
 #include "icq.h"
@@ -56,7 +52,7 @@
 };
 
 int icq_SocketNew(int domain, int type, int protocol);
-int icq_SocketAccept(int listens, struct sockaddr *addr, socklen_t *addrlen);
+int icq_SocketAccept(int listens, struct sockaddr *addr, int *addrlen);
 void icq_SocketAlloc(int socket_fd);
 int icq_SocketDelete(int socket_fd);
 void icq_SocketSetHandler(int socket_fd, int type, icq_SocketHandler handler,