X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=186a8b0834098d4f3f5f750f202fe4a3efc707a2;hp=953d4ac22e6db6a7d04ed65eb9bf47176b6d2975;hb=634720c4e1cac414707bbe0dba0a6c4e47f9e5d9;hpb=e434da0fad7db62d86c236c68b22150165f2647a diff --git a/php_http_std_defs.h b/php_http_std_defs.h index 953d4ac..186a8b0 100644 --- a/php_http_std_defs.h +++ b/php_http_std_defs.h @@ -18,8 +18,14 @@ #ifndef PHP_HTTP_STD_DEFS_H #define PHP_HTTP_STD_DEFS_H -#ifdef PHP_WIN32 -# define PHP_HTTP_API __declspec(dllexport) +#if defined(PHP_WIN32) +# if defined(HTTP_EXPORTS) +# define PHP_HTTP_API __declspec(dllexport) +# elif defined(COMPILE_DL_HTTP) +# define PHP_HTTP_API __declspec(dllimport) +# else +# define PHP_HTTP_API +# endif #else # define PHP_HTTP_API #endif @@ -31,7 +37,25 @@ typedef int STATUS; #define lenof(S) (sizeof(S) - 1) /* return bool (v == SUCCESS) */ +#define RETVAL_SUCCESS(v) RETVAL_BOOL(SUCCESS == (v)) #define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v)) +/* return object(values) */ +#define RETVAL_OBJECT(o) \ + return_value->is_ref = 1; \ + return_value->type = IS_OBJECT; \ + return_value->value.obj = (o)->value.obj; \ + zval_add_ref(&return_value) +#define RETURN_OBJECT(o) \ + RETVAL_OBJECT(o); \ + return +#define RETVAL_OBJVAL(ov) \ + return_value->is_ref = 1; \ + return_value->type = IS_OBJECT; \ + return_value->value.obj = (ov); \ + zend_objects_store_add_ref(return_value TSRMLS_CC) +#define RETURN_OBJVAL(ov) \ + RETVAL_OBJVAL(ov); \ + return /* function accepts no args */ #define NO_ARGS \