[PHP-CVS] cvs: php-src /win32 sendmail.c

[Anantha Kesari H Y]

hyanantha               Thu Jul 28 05:44:13 2005 EDT

  Modified files:              
    /php-src/win32      sendmail.c 
  Log:
  NetWare cleanup
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/win32/sendmail.c?r1=1.63&r2=1.64&ty=u
Index: php-src/win32/sendmail.c
diff -u php-src/win32/sendmail.c:1.63 php-src/win32/sendmail.c:1.64
--- php-src/win32/sendmail.c:1.63       Sat Mar 12 07:03:50 2005
+++ php-src/win32/sendmail.c    Thu Jul 28 05:44:13 2005
@@ -17,7 +17,7 @@
  *
  */
 
-/* $Id: sendmail.c,v 1.63 2005/03/12 12:03:50 andrey Exp $ */
+/* $Id: sendmail.c,v 1.64 2005/07/28 09:44:13 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
@@ -348,14 +346,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 */
 }
 
 
@@ -843,11 +834,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;
@@ -934,11 +921,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;
@@ -954,11 +937,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 */
                        }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php