diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:34:37 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:34:37 -0400 |
| commit | 10f5b47dc7c1cf2b9a00991629f43652710322d3 (patch) | |
| tree | 3b727a16f652b8042d573e90f003868ffb3b56c7 /win32/sendmail.c | |
| parent | 0e920280a2e04b110827bb766b9f29e3d581c4ee (diff) | |
| download | php-10f5b47dc7c1cf2b9a00991629f43652710322d3.tar.gz | |
Imported Upstream version 5.0.5upstream/5.0.5
Diffstat (limited to 'win32/sendmail.c')
| -rw-r--r-- | win32/sendmail.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/win32/sendmail.c b/win32/sendmail.c index d0faf17bd..57677556b 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -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 @@ 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 @@ -346,14 +344,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 */ } @@ -841,11 +832,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; @@ -932,11 +919,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; @@ -952,11 +935,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 */ } |