Drop old VC support (VC <= 9), for dns.c, this means that DNS_TYPE_NAPTR always is...

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 4c3e8331889b74c374dfbbc13b157e41a11f40cf..ae83ec79e73fc56a545eed9d4f023d8505e111a4 100644 (file)
--- 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 7a111b2e3458c68fc683d7bcbd36511254221502..00908b722f16e32ddeb30bb6d8451d2ce6c91928 100644 (file)
--- 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 */