From 8ece8c40c2e59d2a39e05be707babc8828b5ad52 Mon Sep 17 00:00:00 2001
From: wens <wens@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Wed, 9 Apr 2008 11:00:41 +0000
Subject: Drop Solaris support

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4115 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/talk.c | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'mbbsd/talk.c')

diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 199bd639..ea694467 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -1543,11 +1543,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();
@@ -1647,11 +1643,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
 		if (msgsock == -1) {
 		    perror("accept");
 		    close(sock);
@@ -1784,11 +1776,7 @@ my_talk(userinfo_t * uin, int fri_stat, char defact)
 	    return;
 	}
 
-#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");
 	    close(sock);
-- 
cgit v1.2.3