summaryrefslogtreecommitdiff
path: root/ext/imap/php_imap.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2000-04-02 21:27:32 +0000
committerZeev Suraski <zeev@php.net>2000-04-02 21:27:32 +0000
commit18e0850ba17c49de4df15463221fe06027eef01a (patch)
tree7161948804c364e83fb2bc71d30fc72021be755f /ext/imap/php_imap.c
parentde0d354736a08e2218d37dfe70314f81cf765839 (diff)
downloadphp-git-18e0850ba17c49de4df15463221fe06027eef01a.tar.gz
@- Add $HTTP_POST_FILES[filename][tmp_name] - it was previously impossible to
@ retrieve the temporary name of an uploaded file using $HTTP_POST_FILES[] (Zeev) - Changed IMAP Win32 definitions
Diffstat (limited to 'ext/imap/php_imap.c')
-rw-r--r--ext/imap/php_imap.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 839e2e2b53..4ef90a4dc7 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -41,7 +41,7 @@ ZEND_DECLARE_MODULE_GLOBALS(imap)
#include <stdio.h>
#include <ctype.h>
#include <signal.h>
-#if (WIN32|WINNT)
+#ifdef PHP_WIN32
#include "winsock.h"
MAILSTREAM DEFAULTPROTO;
#endif
@@ -130,7 +130,7 @@ function_entry imap_functions[] = {
PHP_FE(imap_alerts, NULL)
PHP_FE(imap_errors, NULL)
PHP_FE(imap_last_error, NULL)
-#if !(WIN32|WINNT)
+#ifndef PHP_WIN32
PHP_FE(imap_mail, NULL)
#endif
PHP_FE(imap_search, NULL)
@@ -380,20 +380,20 @@ PHP_MINIT_FUNCTION(imap)
ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL)
-#if !(WIN32|WINNT)
+#ifndef PHP_WIN32
mail_link(&unixdriver); /* link in the unix driver */
#endif
mail_link(&imapdriver); /* link in the imap driver */
mail_link(&nntpdriver); /* link in the nntp driver */
mail_link(&pop3driver); /* link in the pop3 driver */
-#if !(WIN32|WINNT)
+#ifndef PHP_WIN32
mail_link(&mhdriver); /* link in the mh driver */
mail_link(&mxdriver); /* link in the mx driver */
#endif
mail_link(&mbxdriver); /* link in the mbx driver */
mail_link(&tenexdriver); /* link in the tenex driver */
mail_link(&mtxdriver); /* link in the mtx driver */
-#if !(WIN32|WINNT)
+#ifndef PHP_WIN32
mail_link(&mmdfdriver); /* link in the mmdf driver */
mail_link(&newsdriver); /* link in the news driver */
mail_link(&philedriver); /* link in the phile driver */
@@ -3130,7 +3130,7 @@ PHP_FUNCTION(imap_mail_compose)
}
/* }}} */
-#if !(WIN32|WINNT)
+#ifndef PHP_WIN32
int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *cc, char *bcc, char* rpath)
{
#ifdef PHP_WIN32