pajoye Tue Jan 6 23:37:28 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dns.c
Log:
- these ifdefs are a mess, fix build on win
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.5.2.13&r2=1.70.2.7.2.5.2.14&diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.5.2.13
php-src/ext/standard/dns.c:1.70.2.7.2.5.2.14
--- php-src/ext/standard/dns.c:1.70.2.7.2.5.2.13 Tue Jan 6 21:47:13 2009
+++ php-src/ext/standard/dns.c Tue Jan 6 23:37:28 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dns.c,v 1.70.2.7.2.5.2.13 2009/01/06 21:47:13 pajoye Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.5.2.14 2009/01/06 23:37:28 pajoye Exp $ */
/* {{{ includes */
#include "php.h"
@@ -258,6 +258,25 @@
}
/* }}} */
+#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 @@
}
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 @@
}
/* }}} */
-#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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
