From: Pierre Joye <pajoye@php.net>
Date: Tue, 6 Jan 2009 23:37:28 +0000 (+0000)
Subject: - these ifdefs are a mess, fix build on win
X-Git-Tag: php-5.3.0beta1~260
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f1a0edb111ed05ae16212577da7d63456492633;p=php

- these ifdefs are a mess, fix build on win
---

diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index 596ddabefb..d2649cda0b 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -258,6 +258,25 @@ static char *php_gethostbyname(char *name)
 }
 /* }}} */
 
+#if HAVE_DNS_FUNCS || defined(PHP_WIN32)
+# define PHP_DNS_NUM_TYPES	12	/* Number of DNS Types Supported by PHP currently */
+
+# define PHP_DNS_A      0x00000001
+# define PHP_DNS_NS     0x00000002
+# define PHP_DNS_CNAME  0x00000010
+# define PHP_DNS_SOA    0x00000020
+# define PHP_DNS_PTR    0x00000800
+# define PHP_DNS_HINFO  0x00001000
+# define PHP_DNS_MX     0x00004000
+# define PHP_DNS_TXT    0x00008000
+# define PHP_DNS_A6     0x01000000
+# define PHP_DNS_SRV    0x02000000
+# define PHP_DNS_NAPTR  0x04000000
+# define PHP_DNS_AAAA   0x08000000
+# define PHP_DNS_ANY    0x10000000
+# define PHP_DNS_ALL    (PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_AAAA)
+#endif /* HAVE_DNS_FUNCS || defined(PHP_WIN32) */
+
 #if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE))
 
 /* {{{ proto bool dns_check_record(string host [, string type])
@@ -282,7 +301,7 @@ PHP_FUNCTION(dns_check_record)
 	}
 
 	if (rectype) {
-		     if (!strcasecmp("A",     rectype)) type = T_A;
+		if (!strcasecmp("A",     rectype)) type = T_A;
 		else if (!strcasecmp("NS",    rectype)) type = DNS_T_NS;
 		else if (!strcasecmp("MX",    rectype)) type = DNS_T_MX;
 		else if (!strcasecmp("PTR",   rectype)) type = DNS_T_PTR;
@@ -310,27 +329,6 @@ PHP_FUNCTION(dns_check_record)
 }
 /* }}} */
 
-#if HAVE_DNS_FUNCS || defined(PHP_WIN32)
-# define PHP_DNS_NUM_TYPES	12	/* Number of DNS Types Supported by PHP currently */
-
-# define PHP_DNS_A      0x00000001
-# define PHP_DNS_NS     0x00000002
-# define PHP_DNS_CNAME  0x00000010
-# define PHP_DNS_SOA    0x00000020
-# define PHP_DNS_PTR    0x00000800
-# define PHP_DNS_HINFO  0x00001000
-# define PHP_DNS_MX     0x00004000
-# define PHP_DNS_TXT    0x00008000
-# define PHP_DNS_A6     0x01000000
-# define PHP_DNS_SRV    0x02000000
-# define PHP_DNS_NAPTR  0x04000000
-# define PHP_DNS_AAAA   0x08000000
-# define PHP_DNS_ANY    0x10000000
-# define PHP_DNS_ALL    (PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_AAAA)
-#endif /* HAVE_DNS_FUNCS || defined(PHP_WIN32) */
-
-
-
 #if HAVE_DNS_FUNCS
 
 #ifndef HFIXEDSZ