cvs: /php4/ext/filepro filepro.c /php4/ext/imap imap.c /php4/ext/snmp snmp.c

andi Thu Feb 10 14:01:23 2000 EDT Modified files: /php4/ext/filepro filepro.c /php4/ext/imap imap.c /php4/ext/snmp snmp.c Log: - A few more Index: php4/ext/filepro/filepro.c diff -u php4/ext/filepro/filepro.c:1.11 php4/ext/filepro/filepro.c:1.12 --- php4/ext/filepro/filepro.c:1.11 Fri Dec 31 17:31:33 1999 +++ php4/ext/filepro/filepro.c Thu Feb 10 14:00:52 2000 @@ -27,7 +27,7 @@ #include "safe_mode.h" #include "fopen-wrappers.h" #include <string.h> -#if MSVC5 +#if PHP_WIN32 #include <windows.h> #else #include <sys/param.h> Index: php4/ext/imap/imap.c diff -u php4/ext/imap/imap.c:1.33 php4/ext/imap/imap.c:1.34 --- php4/ext/imap/imap.c:1.33 Tue Feb 8 14:21:43 2000 +++ php4/ext/imap/imap.c Thu Feb 10 14:00:52 2000 @@ -21,7 +21,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: imap.c,v 1.33 2000/02/08 22:21:43 zeev Exp $ */ +/* $Id: imap.c,v 1.34 2000/02/10 22:00:52 andi Exp $ */ #define IMAP41 @@ -3441,14 +3441,14 @@ #if !(WIN32|WINNT) int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *cc, char *bcc, char* rpath) { -#if MSVC5 +#if PHP_WIN32 int tsm_err; #else FILE *sendmail; int ret; #endif -#if MSVC5 +#if PHP_WIN32 if (imap_TSendMail(INI_STR("smtp"),&tsm_err,headers,subject,to,message,cc,bcc,rpath) != SUCCESS){ php_error(E_WARNING, GetSMErrorText(tsm_err)); return 0; Index: php4/ext/snmp/snmp.c diff -u php4/ext/snmp/snmp.c:1.16 php4/ext/snmp/snmp.c:1.17 --- php4/ext/snmp/snmp.c:1.16 Fri Dec 31 17:31:48 1999 +++ php4/ext/snmp/snmp.c Thu Feb 10 14:00:52 2000 @@ -17,7 +17,7 @@ | Steven Lawrance <slawrance@technologist.com> | +----------------------------------------------------------------------+ */ -/* $Id: snmp.c,v 1.16 2000/01/01 01:31:48 sas Exp $ */ +/* $Id: snmp.c,v 1.17 2000/02/10 22:00:52 andi Exp $ */ #include "php.h" #if defined(COMPILE_DL) @@ -25,7 +25,7 @@ #endif #include "php_snmp.h" #include <sys/types.h> -#if MSVC5 +#if PHP_WIN32 #include <winsock.h> #include <errno.h> #include <process.h>