summaryrefslogtreecommitdiffstats
path: root/mbbsd/talk.c
diff options
context:
space:
mode:
Diffstat (limited to 'mbbsd/talk.c')
-rw-r--r--mbbsd/talk.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 12d526bf..8d36d472 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -1390,11 +1390,7 @@ int make_connection_to_somebody(userinfo_t *uin, int timeout){
return -1;
}
length = sizeof(server);
-#if defined(Solaris) && __OS_MAJOR_VERSION__ == 5 && __OS_MINOR_VERSION__ < 7
- if (getsockname(sock, (struct sockaddr *) & server, & length) < 0) {
-#else
if (getsockname(sock, (struct sockaddr *) & server, (socklen_t *) & length) < 0) {
-#endif
close(sock);
perror("sock name err");
unlockutmpmode();
@@ -1492,11 +1488,7 @@ my_talk(userinfo_t * uin, int fri_stat, char defact)
if (sock < 0)
vmsg("無法建立連線");
else {
-#if defined(Solaris) && __OS_MAJOR_VERSION__ == 5 && __OS_MINOR_VERSION__ < 7
- msgsock = accept(sock, (struct sockaddr *) 0, 0);
-#else
msgsock = accept(sock, (struct sockaddr *) 0, (socklen_t *) 0);
-#endif
close(sock);
if (msgsock == -1) {
perror("accept");
@@ -1599,11 +1591,7 @@ my_talk(userinfo_t * uin, int fri_stat, char defact)
sock = make_connection_to_somebody(uin, 5);
-#if defined(Solaris) && __OS_MAJOR_VERSION__ == 5 && __OS_MINOR_VERSION__ < 7
- msgsock = accept(sock, (struct sockaddr *) 0, 0);
-#else
msgsock = accept(sock, (struct sockaddr *) 0, (socklen_t *) 0);
-#endif
if (msgsock == -1) {
perror("accept");
unlockutmpmode();