- move some definitions around

diff --git a/http_functions.c b/http_functions.c
index c4e358d2fe2939501fcde5c8fad0b3cf4b3898ff..8941a93f3e1d7191f27fdde6df41fdd712d13dc5 100644 (file)
--- a/http_functions.c
+++ b/http_functions.c
@@ -56,10 +56,6 @@ PHP_FUNCTION(http_date)
 }
 /* }}} */
 
-#if PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION < 10
-#      define php_url_parse_ex(u, l) php_url_parse(u)
-#endif
-
 /* {{{ proto string http_build_url([mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE[, array &new_url]]]])
        Build an URL. */
 PHP_FUNCTION(http_build_url)

diff --git a/http_request_datashare_api.c b/http_request_datashare_api.c
index 0e7dbf6d8c172924c7b08fb9a628a15f60058baa..6c70f3f7f88fe8f47f288f239cbbfcf2f9d9df6f 100644 (file)
--- a/http_request_datashare_api.c
+++ b/http_request_datashare_api.c
@@ -25,13 +25,6 @@
 #      include "php_http_persistent_handle_api.h"
 #endif
 
-#ifndef HAVE_CURL_SHARE_STRERROR
-#      define curl_share_strerror(dummy) "unknown error"
-#endif
-#ifndef HAVE_CURL_EASY_STRERROR
-#      define curl_easy_strerror(dummy) "unknown error"
-#endif
-
 #ifdef HTTP_HAVE_PERSISTENT_HANDLES
 #      define HTTP_CURL_SHARE_CTOR(ch) (SUCCESS == http_persistent_handle_acquire("http_request_datashare", &(ch)))
 #      define HTTP_CURL_SHARE_DTOR(chp) http_persistent_handle_release("http_request_datashare", (chp))

diff --git a/http_request_pool_api.c b/http_request_pool_api.c
index 29df94f12a5203e4bcc2b0416f8588e88176a567..83413d25262558c715640d8f1516e93bf76f8c2e 100644 (file)
--- a/http_request_pool_api.c
+++ b/http_request_pool_api.c
@@ -29,10 +29,6 @@
 #      define HTTP_DEBUG_REQPOOLS 0
 #endif
 
-#ifndef HAVE_CURL_MULTI_STRERROR
-#      define curl_multi_strerror(dummy) "unknown error"
-#endif
-
 #ifdef HTTP_HAVE_PERSISTENT_HANDLES
 #      define HTTP_CURL_MULTI_CTOR(ch) (SUCCESS == http_persistent_handle_acquire("http_request_pool", &(ch)))
 #      define HTTP_CURL_MULTI_DTOR(chp) http_persistent_handle_release("http_request_pool", (chp))

diff --git a/php_http_request_int.h b/php_http_request_int.h
index 7bf5db1927392c34e91bb17d3396984a4e8f4ded..ae6c125a46601a1fb5aeae5bc1d6fd30ba7cb49f 100644 (file)
--- a/php_http_request_int.h
+++ b/php_http_request_int.h
@@ -46,10 +46,6 @@
 #      endif /* PHP_WIN32 */
 #endif /* ZTS && HTTP_HAVE_SSL */
 
-#ifndef HAVE_CURL_EASY_STRERROR
-#      define curl_easy_strerror(dummy) "unknown error"
-#endif
-
 #define HTTP_CURL_OPT(OPTION, p) curl_easy_setopt((request->ch), OPTION, (p))
 
 #define HTTP_CURL_OPT_STRING(OPTION, ldiff, obdc) \

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index cf3e15fe97b07c251e6a8910c33049accc98684e..8ca7c730ba7f2c6f5c6b61899a0607d925a41416 100644 (file)
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -231,7 +231,6 @@ typedef int STATUS;
 #      define ACC_PROP_PUBLIC(flags)                   (flags & ZEND_ACC_PUBLIC)
 #      define ACC_PROP(ce, flags)                              (ACC_PROP_PUBLIC(flags) || ACC_PROP_PRIVATE(ce, flags) || ACC_PROP_PROTECTED(ce, flags))
 
-#      define SET_EH_THROW() SET_EH_THROW_EX(zend_exception_get_default())
 #      define SET_EH_THROW_HTTP() SET_EH_THROW_EX(http_exception_get_default())
 #      define SET_EH_THROW_EX(ex) php_set_error_handling(EH_THROW, ex TSRMLS_CC)
 #      define SET_EH_NORMAL() php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC)
@@ -259,6 +258,10 @@ typedef int STATUS;
 #      define  ZEND_EXCEPTION_GET_DEFAULT() zend_exception_get_default()
 #endif
 
+#if PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION < 10
+#      define php_url_parse_ex(u, l) php_url_parse(u)
+#endif
+
 #ifndef E_THROW
 #      define E_THROW 0
 #endif
@@ -368,6 +371,16 @@ typedef int STATUS;
 #endif /* HTTP_HAVE_CURL */
 
 
+#ifndef HAVE_CURL_SHARE_STRERROR
+#      define curl_share_strerror(dummy) "unknown error"
+#endif
+#ifndef HAVE_CURL_EASY_STRERROR
+#      define curl_easy_strerror(dummy) "unknown error"
+#endif
+#ifndef HAVE_CURL_MULTI_STRERROR
+#      define curl_multi_strerror(dummy) "unknown error"
+#endif
+
 #ifndef TSRMLS_FETCH_FROM_CTX
 #      ifdef ZTS
 #              define TSRMLS_FETCH_FROM_CTX(ctx)       void ***tsrm_ls = (void ***) ctx