]> granicus.if.org Git - php/commitdiff
PCRE is always available, PHP can't be built without it anyway so these checks makes...
authorKalle Sommer Nielsen <kalle@php.net>
Fri, 24 Nov 2017 23:40:13 +0000 (00:40 +0100)
committerKalle Sommer Nielsen <kalle@php.net>
Fri, 24 Nov 2017 23:40:13 +0000 (00:40 +0100)
win32/sendmail.c

index 78f4b4a2dcf92ddbccea1bb95f8390a18ac3342e..05629db91be35bc19656c149c2cd97b0fba1ea7b 100644 (file)
@@ -1,4 +1,4 @@
-/*
+/*
  *    PHP Sendmail for Windows.
  *
  *  This file is rewriten specificly for PHPFI.  Some functionality
 
 #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
 }
 
 /*********************************************************************