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

[Anantha Kesari H Y]

hyanantha               Thu Jul 28 06:10:19 2005 EDT

  Modified files:              (Branch: PHP_4_4)
    /php-src/win32      sendmail.c 
  Log:
  NetWare changes from 5.0 Tree.
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/win32/sendmail.c?r1=1.47.2.10&r2=1.47.2.10.2.1&ty=u
Index: php-src/win32/sendmail.c
diff -u php-src/win32/sendmail.c:1.47.2.10 
php-src/win32/sendmail.c:1.47.2.10.2.1
--- php-src/win32/sendmail.c:1.47.2.10  Wed Jan 19 13:54:57 2005
+++ php-src/win32/sendmail.c    Thu Jul 28 06:10:16 2005
@@ -17,11 +17,12 @@
  *
  */
 
-/* $Id: sendmail.c,v 1.47.2.10 2005/01/19 18:54:57 iliaa Exp $ */
+/* $Id: sendmail.c,v 1.47.2.10.2.1 2005/07/28 10:10:16 hyanantha Exp $ */
 
 #include "php.h"                               /*php specific */
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef NETWARE
 #include <winsock.h>
 #include "time.h"
 #include <string.h>
@@ -29,6 +30,9 @@
 #include <malloc.h>
 #include <memory.h>
 #include <winbase.h>
+#else
+#include <netware/sendmail_nw.h>
+#endif
 #include "sendmail.h"
 #include "php_ini.h"
 
@@ -74,17 +78,24 @@
 
 /* socket related data */
 SOCKET sc;
+#ifndef NETWARE
 WSADATA Data;
 struct hostent *adr;
-SOCKADDR_IN sock_in;
 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
 char seps[] = " ,\t\n";
+#ifndef NETWARE
 char *php_mailer = "PHP 4 WIN32";
+#else
+char *php_mailer = "PHP 4 NetWare";
+#endif  /* NETWARE */
+
 
 char *get_header(char *h, char *headers);
 
@@ -214,7 +225,10 @@
        char *pos1 = NULL, *pos2 = NULL;
        TSRMLS_FETCH();
 
+#ifndef NETWARE
        WinsockStarted = FALSE;
+#endif
+
 
        if (host == NULL) {
                *error = BAD_MAIL_HOST;

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