diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2015-03-29 06:57:11 +0200 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2015-03-29 06:57:11 +0200 |
| commit | 43457f960ff2e84c87297f09a9dcc0da93ccee32 (patch) | |
| tree | 352ffe4fafbab9a1cd8498ad3d5261eb2679cfbb | |
| parent | 3d4aad5e277e08c3a972eb09ec2f44f06c31ef14 (diff) | |
| download | php-git-43457f960ff2e84c87297f09a9dcc0da93ccee32.tar.gz | |
Drop old VC support (VC <= 9), for dns.c, this means that DNS_TYPE_NAPTR always is available
| -rw-r--r-- | ext/standard/basic_functions.c | 4 | ||||
| -rw-r--r-- | ext/standard/dns_win32.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 4c3e833188..ae83ec79e7 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3383,13 +3383,11 @@ static void php_putenv_destructor(zval *zv) /* {{{ */ putenv_entry *pe = Z_PTR_P(zv); if (pe->previous_value) { -#if _MSC_VER >= 1300 - /* VS.Net has a bug in putenv() when setting a variable that + /* MSVCRT has a bug in putenv() when setting a variable that * is already set; if the SetEnvironmentVariable() API call * fails, the Crt will double free() a string. * We try to avoid this by setting our own value first */ SetEnvironmentVariable(pe->key, "bugbug"); -#endif putenv(pe->previous_value); # if defined(PHP_WIN32) efree(pe->previous_value); diff --git a/ext/standard/dns_win32.c b/ext/standard/dns_win32.c index 7a111b2e34..00908b722f 100644 --- a/ext/standard/dns_win32.c +++ b/ext/standard/dns_win32.c @@ -316,7 +316,6 @@ static void php_parserr(PDNS_RECORD pRec, int type_to_fetch, int store, int raw, } break; -#if _MSC_VER >= 1500 case DNS_TYPE_NAPTR: { DNS_NAPTR_DATA * data_naptr = &pRec->Data.Naptr; @@ -330,7 +329,6 @@ static void php_parserr(PDNS_RECORD pRec, int type_to_fetch, int store, int raw, add_assoc_string(subarray, "replacement", data_naptr->pReplacement); } break; -#endif default: /* unknown type */ |