subject:"\[PHP\-CVS\] cvs\: php\-src\(PHP_5_2\) \/ext\/standard basic

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard basic_functions.c dns.c dns.h

2009-05-20 Thread Jani Taskinen

janiWed May 20 12:09:35 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   basic_functions.c dns.c dns.h 
  Log:
  - Fix win32 build
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.83r2=1.725.2.31.2.84diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.83 
php-src/ext/standard/basic_functions.c:1.725.2.31.2.84
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.83  Tue May 19 
11:12:32 2009
+++ php-src/ext/standard/basic_functions.c  Wed May 20 12:09:33 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.725.2.31.2.83 2009/05/19 11:12:32 jani Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.84 2009/05/20 12:09:33 jani Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -1113,7 +1113,7 @@
ZEND_ARG_INFO(0, hostname)
 ZEND_END_ARG_INFO()
 
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH  !(defined(__BEOS__) || 
defined(NETWARE)))
+#if HAVE_RES_SEARCH  !(defined(__BEOS__) || defined(PHP_WIN32) || 
defined(NETWARE))
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_check_record, 0, 0, 1)
ZEND_ARG_INFO(0, host)
@@ -1138,7 +1138,7 @@
ZEND_ARG_INFO(1, weight) /* ARRAY_INFO(1, weight, 1) */
 ZEND_END_ARG_INFO()
 # endif
-#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH  !(defined(__BEOS__) || 
defined(NETWARE))) */
+#endif /* HAVE_RES_SEARCH  !(defined(__BEOS__) || defined(PHP_WIN32) || 
defined(NETWARE)) */
 /* }}} */
 /* {{{ exec.c */
 static
@@ -3443,7 +3443,7 @@
PHP_FE(gethostbyname,   
arginfo_gethostbyname)
PHP_FE(gethostbynamel,  
arginfo_gethostbynamel)
 
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH  !(defined(__BEOS__) || 
defined(NETWARE)))
+#if HAVE_RES_SEARCH  !(defined(__BEOS__) || defined(PHP_WIN32) || 
defined(NETWARE))
PHP_FE(dns_check_record,
arginfo_dns_check_record)
PHP_FALIAS(checkdnsrr,  dns_check_record,   
arginfo_dns_check_record)
 # if HAVE_DN_SKIPNAME  HAVE_DN_EXPAND
@@ -4078,7 +4078,7 @@
php_register_url_stream_wrapper(ftp, php_stream_ftp_wrapper 
TSRMLS_CC);
 #endif
 
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH  !(defined(__BEOS__) || 
defined(NETWARE)))
+#if HAVE_RES_SEARCH  !(defined(__BEOS__) ||defined(PHP_WIN32) || 
defined(NETWARE))
 # if HAVE_DNS_FUNCS
PHP_MINIT(dns)(INIT_FUNC_ARGS_PASSTHRU);
 # endif
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.10r2=1.70.2.7.2.11diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.10 
php-src/ext/standard/dns.c:1.70.2.7.2.11
--- php-src/ext/standard/dns.c:1.70.2.7.2.10Tue May 19 11:12:33 2009
+++ php-src/ext/standard/dns.c  Wed May 20 12:09:33 2009
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: dns.c,v 1.70.2.7.2.10 2009/05/19 11:12:33 jani Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.11 2009/05/20 12:09:33 jani Exp $ */
 
 /* {{{ includes */
 #include php.h
@@ -244,7 +244,7 @@
 }
 /* }}} */
 
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH  !(defined(__BEOS__) || 
defined(NETWARE)))
+#if HAVE_RES_SEARCH  !(defined(__BEOS__) || defined(PHP_WIN32) || 
defined(NETWARE))
 
 /* {{{ proto int dns_check_record(string host [, string type])
Check DNS records corresponding to a given Internet host name or IP address 
*/
@@ -942,7 +942,8 @@
 }
 /* }}} */
 #endif /* HAVE_DN_SKIPNAME  HAVE_DN_EXPAND */
-#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH  !(defined(__BEOS__) || 
defined(NETWARE))) */
+
+#endif /* HAVE_RES_SEARCH  !(defined(__BEOS__) || defined(PHP_WIN32) || 
defined(NETWARE)) */
 
 /*
  * Local variables:
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.h?r1=1.19.2.1.2.5r2=1.19.2.1.2.6diff_format=u
Index: php-src/ext/standard/dns.h
diff -u php-src/ext/standard/dns.h:1.19.2.1.2.5 
php-src/ext/standard/dns.h:1.19.2.1.2.6
--- php-src/ext/standard/dns.h:1.19.2.1.2.5 Tue May 19 19:38:00 2009
+++ php-src/ext/standard/dns.h  Wed May 20 12:09:33 2009
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: dns.h,v 1.19.2.1.2.5 2009/05/19 19:38:00 jani Exp $ */
+/* $Id: dns.h,v 1.19.2.1.2.6 2009/05/20 12:09:33 jani Exp $ */
 
 #ifndef DNS_H
 #define DNS_H
@@ -31,7 +31,7 @@
 PHP_FUNCTION(gethostbyname);
 PHP_FUNCTION(gethostbynamel);
 
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH  !(defined(__BEOS__) || 
defined(NETWARE)))
+#if HAVE_RES_SEARCH  !(defined(__BEOS__) || defined(PHP_WIN32) || 
defined(NETWARE))

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard basic_functions.c dns.c dns.h

2009-05-19 Thread Jani Taskinen

janiTue May 19 11:12:33 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   basic_functions.c dns.c dns.h 
  Log:
  MFH: Unify macros
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.82r2=1.725.2.31.2.83diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.82 
php-src/ext/standard/basic_functions.c:1.725.2.31.2.83
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.82  Wed Apr 29 
22:06:28 2009
+++ php-src/ext/standard/basic_functions.c  Tue May 19 11:12:32 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.725.2.31.2.82 2009/04/29 22:06:28 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.83 2009/05/19 11:12:32 jani Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -1113,7 +1113,7 @@
ZEND_ARG_INFO(0, hostname)
 ZEND_END_ARG_INFO()
 
-#if HAVE_RES_SEARCH  !(defined(__BEOS__)||defined(PHP_WIN32) || 
defined(NETWARE))
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH  !(defined(__BEOS__) || 
defined(NETWARE)))
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_check_record, 0, 0, 1)
ZEND_ARG_INFO(0, host)
@@ -1138,7 +1138,7 @@
ZEND_ARG_INFO(1, weight) /* ARRAY_INFO(1, weight, 1) */
 ZEND_END_ARG_INFO()
 # endif
-#endif /* HAVE_RES_SEARCH  !(defined(__BEOS__)||defined(PHP_WIN32) || 
defined(NETWARE)) */
+#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH  !(defined(__BEOS__) || 
defined(NETWARE))) */
 /* }}} */
 /* {{{ exec.c */
 static
@@ -3443,7 +3443,7 @@
PHP_FE(gethostbyname,   
arginfo_gethostbyname)
PHP_FE(gethostbynamel,  
arginfo_gethostbynamel)
 
-#if HAVE_RES_SEARCH  !(defined(__BEOS__) || defined(PHP_WIN32) || 
defined(NETWARE))
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH  !(defined(__BEOS__) || 
defined(NETWARE)))
PHP_FE(dns_check_record,
arginfo_dns_check_record)
PHP_FALIAS(checkdnsrr,  dns_check_record,   
arginfo_dns_check_record)
 # if HAVE_DN_SKIPNAME  HAVE_DN_EXPAND
@@ -4078,7 +4078,7 @@
php_register_url_stream_wrapper(ftp, php_stream_ftp_wrapper 
TSRMLS_CC);
 #endif
 
-#if HAVE_RES_SEARCH  !(defined(__BEOS__)||defined(PHP_WIN32) || 
defined(NETWARE))
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH  !(defined(__BEOS__) || 
defined(NETWARE)))
 # if HAVE_DNS_FUNCS
PHP_MINIT(dns)(INIT_FUNC_ARGS_PASSTHRU);
 # endif
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.9r2=1.70.2.7.2.10diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.9 
php-src/ext/standard/dns.c:1.70.2.7.2.10
--- php-src/ext/standard/dns.c:1.70.2.7.2.9 Thu Jan  8 17:20:21 2009
+++ php-src/ext/standard/dns.c  Tue May 19 11:12:33 2009
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: dns.c,v 1.70.2.7.2.9 2009/01/08 17:20:21 felipe Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.10 2009/05/19 11:12:33 jani Exp $ */
 
 /* {{{ includes */
 #include php.h
@@ -244,7 +244,7 @@
 }
 /* }}} */
 
-#if HAVE_RES_SEARCH  !(defined(__BEOS__)||defined(PHP_WIN32) || 
defined(NETWARE))
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH  !(defined(__BEOS__) || 
defined(NETWARE)))
 
 /* {{{ proto int dns_check_record(string host [, string type])
Check DNS records corresponding to a given Internet host name or IP address 
*/
@@ -942,8 +942,7 @@
 }
 /* }}} */
 #endif /* HAVE_DN_SKIPNAME  HAVE_DN_EXPAND */
-
-#endif /* HAVE_RES_SEARCH  !(defined(__BEOS__)||defined(PHP_WIN32) || 
defined(NETWARE)) */
+#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH  !(defined(__BEOS__) || 
defined(NETWARE))) */
 
 /*
  * Local variables:
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.h?r1=1.19.2.1.2.3r2=1.19.2.1.2.4diff_format=u
Index: php-src/ext/standard/dns.h
diff -u php-src/ext/standard/dns.h:1.19.2.1.2.3 
php-src/ext/standard/dns.h:1.19.2.1.2.4
--- php-src/ext/standard/dns.h:1.19.2.1.2.3 Wed Dec 31 11:17:44 2008
+++ php-src/ext/standard/dns.h  Tue May 19 11:12:33 2009
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: dns.h,v 1.19.2.1.2.3 2008/12/31 11:17:44 sebastian Exp $ */
+/* $Id: dns.h,v 1.19.2.1.2.4 2009/05/19 11:12:33 jani Exp $ */
 
 #ifndef DNS_H
 #define DNS_H
@@ -31,7 +31,7 @@
 PHP_FUNCTION(gethostbyname);
 PHP_FUNCTION(gethostbynamel);
 
-#if HAVE_RES_SEARCH  !(defined(__BEOS__)||defined(PHP_WIN32))
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH  !(defined(__BEOS__) || 
defined(NETWARE)))

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard basic_functions.c dns.c dns.h

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard basic_functions.c dns.c dns.h

2 matches

Site Navigation

Mail list logo

Footer information