X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=0d97c4dc4f1816f672f3706d3e96f7c33f63736d;hp=8ca7c730ba7f2c6f5c6b61899a0607d925a41416;hb=accf1817e811a7edabd687ef6105983f39f13942;hpb=e65e4aef04bbda60b8fb12985afbfaa069de9aee

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index 8ca7c73..0d97c4d 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -258,10 +258,6 @@ 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
@@ -381,48 +377,6 @@ typedef int STATUS;
 #	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
-#	else
-#		define TSRMLS_FETCH_FROM_CTX(ctx)
-#	endif
-#endif
-
-#ifndef TSRMLS_SET_CTX
-#	ifdef ZTS
-#		define TSRMLS_SET_CTX(ctx)	ctx = (void ***) tsrm_ls
-#	else
-#		define TSRMLS_SET_CTX(ctx)
-#	endif
-#endif
-
-#ifndef ZVAL_ZVAL
-#define ZVAL_ZVAL(z, zv, copy, dtor) {  \
-		int is_ref, refcount;           \
-		is_ref = (z)->is_ref;           \
-		refcount = (z)->refcount;       \
-		*(z) = *(zv);                   \
-		if (copy) {                     \
-			zval_copy_ctor(z);          \
-	    }                               \
-		if (dtor) {                     \
-			if (!copy) {                \
-				ZVAL_NULL(zv);          \
-			}                           \
-			zval_ptr_dtor(&zv);         \
-	    }                               \
-		(z)->is_ref = is_ref;           \
-		(z)->refcount = refcount;       \
-	}
-#endif
-#ifndef RETVAL_ZVAL
-#define RETVAL_ZVAL(zv, copy, dtor)		ZVAL_ZVAL(return_value, zv, copy, dtor)
-#endif
-#ifndef RETURN_ZVAL
-#define RETURN_ZVAL(zv, copy, dtor)		{ RETVAL_ZVAL(zv, copy, dtor); return; }
-#endif
-
 #define PHP_MINIT_CALL(func) PHP_MINIT(func)(INIT_FUNC_ARGS_PASSTHRU)
 #define PHP_RINIT_CALL(func) PHP_RINIT(func)(INIT_FUNC_ARGS_PASSTHRU)
 #define PHP_MSHUTDOWN_CALL(func) PHP_MSHUTDOWN(func)(SHUTDOWN_FUNC_ARGS_PASSTHRU)