Skip to content

Commit ffbe801

Browse files
committed
PCRE is always available, PHP can't be built without it anyway so these checks makes no sense anymore
1 parent 828d8e6 commit ffbe801

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

win32/sendmail.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* PHP Sendmail for Windows.
33
*
44
* This file is rewriten specificly for PHPFI. Some functionality
@@ -36,10 +36,7 @@
3636

3737
#include "php_win32_globals.h"
3838

39-
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
4039
#include "ext/pcre/php_pcre.h"
41-
#endif
42-
4340
#include "ext/standard/php_string.h"
4441
#include "ext/date/php_date.h"
4542

@@ -130,9 +127,6 @@ static char *ErrorMessages[] =
130127
*/
131128
static zend_string *php_win32_mail_trim_header(char *header)
132129
{
133-
134-
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
135-
136130
zend_string *result, *result2;
137131
zend_string *replace;
138132
zend_string *regex;
@@ -170,10 +164,6 @@ static zend_string *php_win32_mail_trim_header(char *header)
170164
zend_string_release(result);
171165

172166
return result2;
173-
#else
174-
/* In case we don't have PCRE support (for whatever reason...) simply do nothing and return the unmodified header */
175-
return zend_string_init(header, strlen(header), 0);
176-
#endif
177167
}
178168

179169
/*********************************************************************

0 commit comments

Comments
 (0)