hyanantha Thu Jul 28 04:57:38 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/win32 sendmail.c sendmail.h Log: Cleaned up the NetWare specific code http://cvs.php.net/diff.php/php-src/win32/sendmail.c?r1=1.59.2.3&r2=1.59.2.4&ty=u Index: php-src/win32/sendmail.c diff -u php-src/win32/sendmail.c:1.59.2.3 php-src/win32/sendmail.c:1.59.2.4 --- php-src/win32/sendmail.c:1.59.2.3 Fri Mar 11 05:48:06 2005 +++ php-src/win32/sendmail.c Thu Jul 28 04:57:37 2005 @@ -17,7 +17,7 @@ * */ -/* $Id: sendmail.c,v 1.59.2.3 2005/03/11 10:48:06 hyanantha Exp $ */ +/* $Id: sendmail.c,v 1.59.2.4 2005/07/28 08:57:37 hyanantha Exp $ */ #include "php.h" /*php specific */ #include <stdio.h> @@ -83,13 +83,11 @@ #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 @@ -346,14 +344,7 @@ */ 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 */ } @@ -841,11 +832,7 @@ // 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; @@ -932,11 +919,7 @@ // 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; @@ -952,11 +935,7 @@ 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 */ } http://cvs.php.net/diff.php/php-src/win32/sendmail.h?r1=1.13&r2=1.13.2.1&ty=u Index: php-src/win32/sendmail.h diff -u php-src/win32/sendmail.h:1.13 php-src/win32/sendmail.h:1.13.2.1 --- php-src/win32/sendmail.h:1.13 Mon Dec 8 17:10:42 2003 +++ php-src/win32/sendmail.h Thu Jul 28 04:57:38 2005 @@ -44,18 +44,7 @@ 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 */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php