From: Anantha Kesari H Y <hyanantha@php.net>
Date: Thu, 28 Jul 2005 09:44:13 +0000 (+0000)
Subject: NetWare cleanup
X-Git-Tag: RELEASE_2_0_0~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a89e44ed7d5fe20925dd02db1964288239920e2;p=php

NetWare cleanup
--Kamesh
---

diff --git a/win32/sendmail.c b/win32/sendmail.c
index b2135a2d0d..0764f803b6 100644
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -83,13 +83,11 @@ SOCKET sc;
 #ifndef NETWARE
 WSADATA Data;
 struct hostent *adr;
-#endif	/* NETWARE */
-SOCKADDR_IN sock_in;
-#ifndef NETWARE
 int WinsockStarted;
 /* values set by the constructor */
 char *AppName;
 #endif	/* NETWARE */
+SOCKADDR_IN sock_in;
 char MailHost[HOST_NAME_LEN];
 char LocalHost[HOST_NAME_LEN];
 #endif
@@ -348,14 +346,7 @@ PHPAPI void TSMClose()
 	*/
 
 	shutdown(sc, 0); 
-#ifndef NETWARE
 	closesocket(sc);
-#else
-	/* closesocket commented out since it was giving undefined symbol linker error
-	 * close added in its place
-	 */
-	close(sc);
-#endif	/* NETWARE */
 }
 
 
@@ -843,11 +834,7 @@ int MailConnect()
 // Author/Date:  jcar 20/9/96
 // History:
 //********************************************************************/
-#ifndef NETWARE
 int Post(LPCSTR msg)
-#else
-int Post(char *msg)
-#endif
 {
 	int len = strlen(msg);
 	int slen;
@@ -934,11 +921,7 @@ int Ack(char **server_response)
 // Author/Date:  jcar 20/9/96
 // History:
 //********************************************************************/
-#ifndef NETWARE
 unsigned long GetAddr(LPSTR szHost)
-#else
-unsigned long GetAddr(char * szHost)
-#endif
 {
 	LPHOSTENT lpstHost;
 	u_long lAddr = INADDR_ANY;
@@ -954,11 +937,7 @@ unsigned long GetAddr(char * szHost)
 
 			lpstHost = gethostbyname(szHost);
 			if (lpstHost) {		/* success */
-#ifndef NETWARE
 				lAddr = *((u_long FAR *) (lpstHost->h_addr));
-#else
-				lAddr = *((u_long *) (lpstHost->h_addr));
-#endif	/* NETWARE */
 			} else {
 				lAddr = INADDR_ANY;		/* failure */
 			}
diff --git a/win32/sendmail.h b/win32/sendmail.h
index 3f3539e24c..28b5d73499 100644
--- a/win32/sendmail.h
+++ b/win32/sendmail.h
@@ -44,18 +44,7 @@ PHPAPI char *GetSMErrorText(int index);
 
 int MailConnect();
 int PostHeader(char *, char *, char *, char *);
-#ifndef NETWARE
 int Post(LPCSTR msg);
-#else
-int Post(char *msg);
-#endif
 int Ack(char **server_response);
-#ifndef NETWARE
 unsigned long GetAddr(LPSTR szHost);
-#else
-unsigned long GetAddr(char * szHost);
-#endif
-
-
-
 #endif							/* sendmail_h */