1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

PCRE is always available, PHP can't be built without it anyway so these checks makes no sense anymore

This commit is contained in:
Kalle Sommer Nielsen
2017-11-25 00:40:13 +01:00
parent 828d8e635b
commit ffbe801226

View File

@@ -1,4 +1,4 @@
/*
/*
* PHP Sendmail for Windows.
*
* This file is rewriten specificly for PHPFI. Some functionality
@@ -36,10 +36,7 @@
#include "php_win32_globals.h"
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
#include "ext/pcre/php_pcre.h"
#endif
#include "ext/standard/php_string.h"
#include "ext/date/php_date.h"
@@ -130,9 +127,6 @@ static char *ErrorMessages[] =
*/
static zend_string *php_win32_mail_trim_header(char *header)
{
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
zend_string *result, *result2;
zend_string *replace;
zend_string *regex;
@@ -170,10 +164,6 @@ static zend_string *php_win32_mail_trim_header(char *header)
zend_string_release(result);
return result2;
#else
/* In case we don't have PCRE support (for whatever reason...) simply do nothing and return the unmodified header */
return zend_string_init(header, strlen(header), 0);
#endif
}
/*********************************************************************