projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- allow to avoid deps on shared extensions on build time
[m6w6/ext-http]
/
http_querystring_object.c
diff --git
a/http_querystring_object.c
b/http_querystring_object.c
index d0eed53d14942490d5f43db6a464055b8930518b..73ef9d5960d94470dee7e62ba8375cc27611ced3 100644
(file)
--- a/
http_querystring_object.c
+++ b/
http_querystring_object.c
@@
-61,7
+61,7
@@
HTTP_BEGIN_ARGS(__getter, 1)
HTTP_ARG_VAL(delete, 0)
HTTP_END_ARGS;
HTTP_ARG_VAL(delete, 0)
HTTP_END_ARGS;
-#ifdef HAVE_ICONV
+#ifdef HAVE_ICONV
&& !HTTP_SHARED_EXT(ICONV)
HTTP_BEGIN_ARGS(xlate, 2)
HTTP_ARG_VAL(from_encoding, 0)
HTTP_ARG_VAL(to_encoding, 0)
HTTP_BEGIN_ARGS(xlate, 2)
HTTP_ARG_VAL(from_encoding, 0)
HTTP_ARG_VAL(to_encoding, 0)
@@
-95,7
+95,7
@@
zend_function_entry http_querystring_object_fe[] = {
#ifndef WONKY
HTTP_QUERYSTRING_ME(singleton, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
#endif
#ifndef WONKY
HTTP_QUERYSTRING_ME(singleton, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
#endif
-#ifdef HAVE_ICONV
+#ifdef HAVE_ICONV
&& !HTTP_SHARED_EXT(ICONV)
HTTP_QUERYSTRING_ME(xlate, ZEND_ACC_PUBLIC)
#endif
HTTP_QUERYSTRING_ME(xlate, ZEND_ACC_PUBLIC)
#endif
@@
-431,7
+431,7
@@
HTTP_QUERYSTRING_GETTER(getArray, IS_ARRAY);
HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT);
/* }}} */
HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT);
/* }}} */
-#ifdef HAVE_ICONV
+#ifdef HAVE_ICONV
&& !HTTP_SHARED_EXT(ICONV)
/* {{{ proto bool HttpQueryString::xlate(string ie, string oe)
*
* Converts the query string from the source encoding ie to the target encoding oe.
/* {{{ proto bool HttpQueryString::xlate(string ie, string oe)
*
* Converts the query string from the source encoding ie to the target encoding oe.